diff options
| author | Vladimír Čunát <v@cunat.cz> | 2021-05-14 22:27:34 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2021-05-14 22:27:34 +0200 |
| commit | c48eaa70e3d3954835efeeb1991f8c654dc65da7 (patch) | |
| tree | 713b55f97428186fb8eb0a3ea1848d3f0456b3a1 /pkgs/tools/package-management | |
| parent | 55282bd6f60f9a10dbbce7a35c20bc78f0b3b7d6 (diff) | |
| parent | cc2fc35667b5871ad8a7fc7a73d32f4e81068c4c (diff) | |
| download | nixpkgs-c48eaa70e3d3954835efeeb1991f8c654dc65da7.tar nixpkgs-c48eaa70e3d3954835efeeb1991f8c654dc65da7.tar.gz nixpkgs-c48eaa70e3d3954835efeeb1991f8c654dc65da7.tar.bz2 nixpkgs-c48eaa70e3d3954835efeeb1991f8c654dc65da7.tar.lz nixpkgs-c48eaa70e3d3954835efeeb1991f8c654dc65da7.tar.xz nixpkgs-c48eaa70e3d3954835efeeb1991f8c654dc65da7.tar.zst nixpkgs-c48eaa70e3d3954835efeeb1991f8c654dc65da7.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/tools/package-management')
| -rw-r--r-- | pkgs/tools/package-management/nix/default.nix | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index a16e74819a6..d808eebcc93 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -196,19 +196,12 @@ in rec { nixStable = callPackage common (rec { pname = "nix"; - version = "2.3.10"; + version = "2.3.11"; src = fetchurl { url = "https://nixos.org/releases/nix/${pname}-${version}/${pname}-${version}.tar.xz"; - sha256 = "a8a85e55de43d017abbf13036edfb58674ca136691582f17080c1cd12787b7ab"; + sha256 = "89a8d7995305a78b1561e6670bbf1879c791fc4904eb094bc4f180775a61c128"; }; - patches = [( - fetchpatch { - url = "https://github.com/NixOS/nix/pull/4316.patch"; - sha256 = "0bqlm4n9sac9prgr9xlfng92arisp1hiqvc9pfh4fibsppkgdfc5"; - } - )]; - inherit storeDir stateDir confDir boehmgc; }); |