diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2020-05-12 15:44:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-12 15:44:11 +0200 |
| commit | 77d40b220508d1cc95b6116f4716a944a4f73455 (patch) | |
| tree | 3630215f6d407ba317d1cf98abbfc1c1aac19673 | |
| parent | 1a84fb06d8cc7b5d01ad11b165d524a4bb34814c (diff) | |
| parent | 15d1011615d16a8b731adf28e2cfc33481102780 (diff) | |
| download | nixlib-77d40b220508d1cc95b6116f4716a944a4f73455.tar nixlib-77d40b220508d1cc95b6116f4716a944a4f73455.tar.gz nixlib-77d40b220508d1cc95b6116f4716a944a4f73455.tar.bz2 nixlib-77d40b220508d1cc95b6116f4716a944a4f73455.tar.lz nixlib-77d40b220508d1cc95b6116f4716a944a4f73455.tar.xz nixlib-77d40b220508d1cc95b6116f4716a944a4f73455.tar.zst nixlib-77d40b220508d1cc95b6116f4716a944a4f73455.zip | |
Merge pull request #87663 from nlewo/nixUnstable
nixUnstable: pre7346_5e7ccdc9 -> pre7534_b92f58f6
| -rw-r--r-- | pkgs/tools/package-management/nix/default.nix | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 62192485391f..c44c7d4c96dc 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -14,6 +14,8 @@ common = , pkgconfig, boehmgc, perlPackages, libsodium, brotli, boost, editline, nlohmann_json , autoreconfHook, autoconf-archive, bison, flex, libxml2, libxslt, docbook5, docbook_xsl_ns , jq, libarchive, rustc, cargo + # Used by tests + , gmock , busybox-sandbox-shell , storeDir , stateDir @@ -39,7 +41,8 @@ common = nativeBuildInputs = [ pkgconfig ] - ++ lib.optionals is24 [ autoreconfHook autoconf-archive bison flex libxml2 libxslt docbook5 docbook_xsl_ns jq ]; + ++ lib.optionals is24 [ autoreconfHook autoconf-archive bison flex libxml2 libxslt + docbook5 docbook_xsl_ns jq gmock ]; buildInputs = [ curl openssl sqlite xz bzip2 nlohmann_json @@ -188,18 +191,18 @@ in rec { nixUnstable = lib.lowPrio (callPackage common rec { name = "nix-2.4${suffix}"; - suffix = "pre7346_5e7ccdc9"; + suffix = "pre7534_b92f58f6"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "5e7ccdc9e3ddd61dc85e20c898001345bfb497a5"; - sha256 = "10jg0rq92xbigbbri7harn4b75blqaf6rjgq4hhvlnggf2w9iprg"; + rev = "b92f58f6d9e44f97002d1722bd77bad939824c1c"; + sha256 = "1p791961y5v04kpz37g6hm98f1ig7i34inxl9dcj3pbqhf5kicxg"; }; crates = fetchurl { - url = "https://hydra.nixos.org/build/115942497/download/1/nix-vendored-crates-2.4pre20200403_3473b19.tar.xz"; - sha256 = "a83785553bb4bc5b28220562153e201ec555a00171466ac08b716f0c97aee45a"; + url = "https://hydra.nixos.org/build/118797694/download/1/nix-vendored-crates-2.4pre7534_b92f58f6.tar.xz"; + sha256 = "a4c2612bbd81732bbb899bc0c230e07b16f6b6150ffbb19c4907dedbbc2bf9fc"; }; inherit storeDir stateDir confDir boehmgc; |