about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2020-05-06 14:15:51 +0200
committerGitHub <noreply@github.com>2020-05-06 14:15:51 +0200
commit90b5fe237200d5420af7f72a2936018280622e1b (patch)
tree2cac2faba0f30ffce9b5eaed2db0cce379e625c9
parent255ccf8cba4f02bb5cbb42345ebe7866f3a119a0 (diff)
parentf1e3278849c95a65a61d423c9d6c95263b107319 (diff)
downloadnixlib-90b5fe237200d5420af7f72a2936018280622e1b.tar
nixlib-90b5fe237200d5420af7f72a2936018280622e1b.tar.gz
nixlib-90b5fe237200d5420af7f72a2936018280622e1b.tar.bz2
nixlib-90b5fe237200d5420af7f72a2936018280622e1b.tar.lz
nixlib-90b5fe237200d5420af7f72a2936018280622e1b.tar.xz
nixlib-90b5fe237200d5420af7f72a2936018280622e1b.tar.zst
nixlib-90b5fe237200d5420af7f72a2936018280622e1b.zip
Merge pull request #86819 from eadwu/nixFlakes/2.4pre20200501_941f952
nixFlakes: 2.4pre20200403_3473b19 -> 2.4pre20200501_941f952
-rw-r--r--pkgs/tools/package-management/nix/default.nix10
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 baeae0ef52b9..62192485391f 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -207,18 +207,18 @@ in rec {
 
   nixFlakes = lib.lowPrio (callPackage common rec {
     name = "nix-2.4${suffix}";
-    suffix = "pre20200403_3473b19";
+    suffix = "pre20200501_941f952";
 
     src = fetchFromGitHub {
       owner = "NixOS";
       repo = "nix";
-      rev = "3473b1950a90d596a3baa080fdfdb080f55a5cc0";
-      sha256 = "1bb7a8a5lzmb3pzq80zxd3s9y3qv757q7032s5wvp75la9wgvmvr";
+      rev = "941f95284ab57e9baa317791327cf1715d8564b5";
+      sha256 = "0d99jl5baxji5dmqb4fwmbffx0z04k0naanms5zzbwvxdmzn3yhs";
     };
 
     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/118093786/download/1/nix-vendored-crates-2.4pre20200501_941f952.tar.xz";
+      sha256 = "060f4n5srdbb8vsj0m14aqch7im79a4h5g3nrs41p1xc602vhcdl";
     };
 
     inherit storeDir stateDir confDir boehmgc;