diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2017-09-15 11:27:20 +0200 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2017-09-15 11:27:32 +0200 |
| commit | b86fd340f077e89c54d88e33dd294eef32acd0fd (patch) | |
| tree | 8e982b56ec76d29cb63f8bf9145032ff51b9aa2f /pkgs/tools/package-management | |
| parent | 608045aed54c3579923d54c533b2d57a09c361e1 (diff) | |
| download | nixlib-b86fd340f077e89c54d88e33dd294eef32acd0fd.tar nixlib-b86fd340f077e89c54d88e33dd294eef32acd0fd.tar.gz nixlib-b86fd340f077e89c54d88e33dd294eef32acd0fd.tar.bz2 nixlib-b86fd340f077e89c54d88e33dd294eef32acd0fd.tar.lz nixlib-b86fd340f077e89c54d88e33dd294eef32acd0fd.tar.xz nixlib-b86fd340f077e89c54d88e33dd294eef32acd0fd.tar.zst nixlib-b86fd340f077e89c54d88e33dd294eef32acd0fd.zip | |
nixUnstable: 1.12pre5511_c94f3d55 -> 1.12pre5619_346aeee1
Diffstat (limited to 'pkgs/tools/package-management')
| -rw-r--r-- | pkgs/tools/package-management/nix/default.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 3d0c89091779..2192113711c7 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, fetchFromGitHub, perl, curl, bzip2, sqlite, openssl ? null, xz , pkgconfig, boehmgc, perlPackages, libsodium, aws-sdk-cpp, brotli, readline , autoreconfHook, autoconf-archive, bison, flex, libxml2, libxslt, docbook5, docbook5_xsl -, libseccomp, busybox +, libseccomp, busybox, nlohmann_json , hostPlatform , storeDir ? "/nix/store" , stateDir ? "/nix/var" @@ -39,7 +39,7 @@ let buildInputs = [ curl openssl sqlite xz ] ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium - ++ lib.optionals fromGit [ brotli readline ] # Since 1.12 + ++ lib.optionals fromGit [ brotli readline nlohmann_json ] # Since 1.12 ++ lib.optional stdenv.isLinux libseccomp ++ lib.optional ((stdenv.isLinux || stdenv.isDarwin) && is112) (aws-sdk-cpp.override { @@ -161,12 +161,12 @@ in rec { nixUnstable = (lib.lowPrio (common rec { name = "nix-1.12${suffix}"; - suffix = "pre5511_c94f3d55"; + suffix = "pre5619_346aeee1"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "c94f3d5575d7af5403274d1e9e2f3c9d72989751"; - sha256 = "1akfzzm4f07wj6l7za916xv5rnh71pk3vl8dphgradjfqb37bv18"; + rev = "346aeee1cb21b5cab5ddc3e8658c88321f513761"; + sha256 = "0lyrs0mqnh89w1nzrqpxvnh7bdjpg8j22xaidql47f1nwbblmn3f"; }; fromGit = true; })) // { perl-bindings = perl-bindings { nix = nixUnstable; }; }; |