diff options
Diffstat (limited to 'release.nix')
| -rw-r--r-- | release.nix | 49 |
1 files changed, 12 insertions, 37 deletions
diff --git a/release.nix b/release.nix index 3f8d5da4721e..8befc15221aa 100644 --- a/release.nix +++ b/release.nix @@ -1,5 +1,5 @@ { nix ? builtins.fetchGit ./. -, nixpkgs ? builtins.fetchGit { url = https://github.com/NixOS/nixpkgs.git; ref = "nix-2.0"; } +, nixpkgs ? builtins.fetchGit { url = https://github.com/NixOS/nixpkgs-channels.git; ref = "nixos-18.03"; } , officialRelease ? false , systems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" ] }: @@ -14,6 +14,8 @@ let tarball = with pkgs; + with import ./release-common.nix { inherit pkgs; }; + releaseTools.sourceTarball { name = "nix-tarball"; version = builtins.readFile ./version; @@ -21,13 +23,7 @@ let src = nix; inherit officialRelease; - buildInputs = - [ curl bison flex libxml2 libxslt - bzip2 xz brotli - pkgconfig sqlite libsodium boehmgc - docbook5 docbook5_xsl - autoconf-archive - ] ++ lib.optional stdenv.isLinux libseccomp; + buildInputs = tarballDeps ++ buildDeps; configureFlags = "--enable-gc"; @@ -59,7 +55,9 @@ let build = pkgs.lib.genAttrs systems (system: - with import nixpkgs { inherit system; }; + let pkgs = import nixpkgs { inherit system; }; in + + with pkgs; with import ./release-common.nix { inherit pkgs; }; @@ -67,22 +65,7 @@ let name = "nix"; src = tarball; - buildInputs = - [ curl - bzip2 xz brotli - openssl pkgconfig sqlite boehmgc - - # Tests - git - mercurial - ] - ++ lib.optional stdenv.isLinux libseccomp - ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium - ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) - (aws-sdk-cpp.override { - apis = ["s3"]; - customMemoryManagement = false; - }); + buildInputs = buildDeps; configureFlags = configureFlags ++ [ "--sysconfdir=/etc" ]; @@ -172,17 +155,15 @@ let coverage = - with import nixpkgs { system = "x86_64-linux"; }; + with pkgs; + + with import ./release-common.nix { inherit pkgs; }; releaseTools.coverageAnalysis { name = "nix-build"; src = tarball; - buildInputs = - [ curl bzip2 openssl pkgconfig sqlite xz libsodium libseccomp - # These are for "make check" only: - graphviz libxml2 libxslt git mercurial - ]; + buildInputs = buildDeps; configureFlags = '' --disable-init-state @@ -284,12 +265,6 @@ let binaryTarball.i686-linux binaryTarball.x86_64-darwin binaryTarball.x86_64-linux - #deb_debian8i386 - #deb_debian8x86_64 - deb_ubuntu1604i386 - deb_ubuntu1604x86_64 - rpm_fedora25i386 - rpm_fedora25x86_64 tests.remoteBuilds tests.nix-copy-closure tests.binaryTarball |