diff options
author | Eelco Dolstra <edolstra@gmail.com> | 2018-09-03 01:23:35 +0200 |
---|---|---|
committer | Eelco Dolstra <edolstra@gmail.com> | 2018-09-03 01:37:55 +0200 |
commit | 347638ccfee74c06cae53983ea741d39d1efc032 (patch) | |
tree | 91a390b7e264e05e964d27b75eca0204c85e6d40 /pkgs/tools | |
parent | 4652f2f87ebfa82b3c9fde3dd0cd7a84fe90ff58 (diff) | |
download | nixlib-347638ccfee74c06cae53983ea741d39d1efc032.tar nixlib-347638ccfee74c06cae53983ea741d39d1efc032.tar.gz nixlib-347638ccfee74c06cae53983ea741d39d1efc032.tar.bz2 nixlib-347638ccfee74c06cae53983ea741d39d1efc032.tar.lz nixlib-347638ccfee74c06cae53983ea741d39d1efc032.tar.xz nixlib-347638ccfee74c06cae53983ea741d39d1efc032.tar.zst nixlib-347638ccfee74c06cae53983ea741d39d1efc032.zip |
nix: 2.0.4 -> 2.1
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/package-management/nix/default.nix | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index bc07dd457f38..a447fbf22827 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -29,7 +29,7 @@ let buildInputs = [ curl openssl sqlite xz bzip2 ] ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium - ++ lib.optionals is20 [ brotli ] # Since 1.12 + ++ lib.optionals is20 [ brotli boost ] ++ lib.optional withLibseccomp libseccomp ++ lib.optional ((stdenv.isLinux || stdenv.isDarwin) && is20) ((aws-sdk-cpp.override { @@ -40,8 +40,7 @@ let url = https://github.com/edolstra/aws-sdk-cpp/commit/7d58e303159b2fb343af9a1ec4512238efa147c7.patch; sha256 = "103phn6kyvs1yc7fibyin3lgxz699qakhw671kl207484im55id1"; })]; - })) - ++ lib.optional fromGit boost; + })); propagatedBuildInputs = [ boehmgc ]; @@ -51,7 +50,7 @@ let preConfigure = # Copy libboost_context so we don't get all of Boost in our closure. # https://github.com/NixOS/nixpkgs/issues/45462 - lib.optionalString fromGit + lib.optionalString is20 '' mkdir -p $out/lib cp ${boost}/lib/libboost_context* $out/lib @@ -148,10 +147,10 @@ in rec { }) // { perl-bindings = nix1; }; nixStable = (common rec { - name = "nix-2.0.4"; + name = "nix-2.1"; src = fetchurl { url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz"; - sha256 = "166540ff7b8bb41449586b67e5fc6ab9e25525f6724b6c6bcbfb0648fbd6496b"; + sha256 = "0ed68e0c50f13810768fcf510abb2c56d735172c39a325aac7453ccf7ae152fc"; }; }) // { perl-bindings = perl-bindings { nix = nixStable; }; }; |