diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-05-15 06:22:25 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-15 06:22:25 +0000 |
commit | 78ae7ac75e1f68d96e4dc0e383eae62274afb833 (patch) | |
tree | 15c9d71e770d9beec43df8d12b9696793b5fd3e8 /pkgs/tools/package-management | |
parent | 2e55b7301bdfa9a5a5e0dfa18bb99d9a2c13e12d (diff) | |
parent | c48794dcef927c8af48457f744cd81468046515e (diff) | |
download | nixpkgs-78ae7ac75e1f68d96e4dc0e383eae62274afb833.tar nixpkgs-78ae7ac75e1f68d96e4dc0e383eae62274afb833.tar.gz nixpkgs-78ae7ac75e1f68d96e4dc0e383eae62274afb833.tar.bz2 nixpkgs-78ae7ac75e1f68d96e4dc0e383eae62274afb833.tar.lz nixpkgs-78ae7ac75e1f68d96e4dc0e383eae62274afb833.tar.xz nixpkgs-78ae7ac75e1f68d96e4dc0e383eae62274afb833.tar.zst nixpkgs-78ae7ac75e1f68d96e4dc0e383eae62274afb833.zip |
Merge staging-next into staging
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; }); |