diff options
| author | Alyssa Ross <hi@alyssa.is> | 2020-06-04 10:19:13 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-06-04 22:45:31 +0000 |
| commit | da8562f302a145605a3270114ea7063daa82a173 (patch) | |
| tree | b27c6d509bad0ee5449f1fcf261a7ec3210df495 /nixpkgs/pkgs/tools/package-management/nix/default.nix | |
| parent | 17df60ef482ef52b2088e1913de9cd436320612a (diff) | |
| parent | 467ce5a9f45aaf96110b41eb863a56866e1c2c3c (diff) | |
| download | nixlib-da8562f302a145605a3270114ea7063daa82a173.tar nixlib-da8562f302a145605a3270114ea7063daa82a173.tar.gz nixlib-da8562f302a145605a3270114ea7063daa82a173.tar.bz2 nixlib-da8562f302a145605a3270114ea7063daa82a173.tar.lz nixlib-da8562f302a145605a3270114ea7063daa82a173.tar.xz nixlib-da8562f302a145605a3270114ea7063daa82a173.tar.zst nixlib-da8562f302a145605a3270114ea7063daa82a173.zip | |
Merge commit '467ce5a9f45aaf96110b41eb863a56866e1c2c3c'
Diffstat (limited to 'nixpkgs/pkgs/tools/package-management/nix/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/tools/package-management/nix/default.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/tools/package-management/nix/default.nix b/nixpkgs/pkgs/tools/package-management/nix/default.nix index c44c7d4c96dc..6b512c253cee 100644 --- a/nixpkgs/pkgs/tools/package-management/nix/default.nix +++ b/nixpkgs/pkgs/tools/package-management/nix/default.nix @@ -178,10 +178,10 @@ in rec { nix = nixStable; nixStable = callPackage common (rec { - name = "nix-2.3.4"; + name = "nix-2.3.5"; src = fetchurl { url = "https://nixos.org/releases/nix/${name}/${name}.tar.xz"; - sha256 = "1c626a0de0acc69830b1891ec4d3c96aabe673b2a9fd04cef84f2304d05ad00d"; + sha256 = "25445353c27d7c2703cd74216bce6458a02068965055d111765ac4186ed678c1"; }; inherit storeDir stateDir confDir boehmgc; @@ -210,13 +210,13 @@ in rec { nixFlakes = lib.lowPrio (callPackage common rec { name = "nix-2.4${suffix}"; - suffix = "pre20200501_941f952"; + suffix = "pre20200521_00b562c"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "941f95284ab57e9baa317791327cf1715d8564b5"; - sha256 = "0d99jl5baxji5dmqb4fwmbffx0z04k0naanms5zzbwvxdmzn3yhs"; + rev = "00b562c87ec4c3bbe514f5dc1f4d1c41f66f66bf"; + sha256 = "0s8is2czpkcj1x1kcjqgbnsbbl03w3fwjjiclsd44zh1ij3wb90s"; }; crates = fetchurl { |