diff options
author | Eelco Dolstra <edolstra@gmail.com> | 2021-05-14 13:11:26 +0200 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-05-14 12:24:54 +0000 |
commit | b08e223a048022dcbaaeb82943f7c4e8e870397d (patch) | |
tree | 45b028e482d58382965645ec303a8dac22ed229e | |
parent | 64f46d44d4aa20c85032965833021f84b207c8a9 (diff) |
nix: 2.3.10 -> 2.3.11
The patch is included in the new release, so can be dropped. Co-authored-by: Alyssa Ross <hi@alyssa.is>
-rw-r--r-- | nixos/modules/installer/tools/nix-fallback-paths.nix | 8 | ||||
-rw-r--r-- | pkgs/tools/package-management/nix/default.nix | 11 |
2 files changed, 6 insertions, 13 deletions
diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix index 6b1f54beee2ea..801e28cec44ae 100644 --- a/nixos/modules/installer/tools/nix-fallback-paths.nix +++ b/nixos/modules/installer/tools/nix-fallback-paths.nix @@ -1,6 +1,6 @@ { - x86_64-linux = "/nix/store/iwfs2bfcy7lqwhri94p2i6jc87ih55zk-nix-2.3.10"; - i686-linux = "/nix/store/a3ccfvy9i5n418d5v0bir330kbcz3vj8-nix-2.3.10"; - aarch64-linux = "/nix/store/bh5g6cv7bv35iz853d3xv2sphn51ybmb-nix-2.3.10"; - x86_64-darwin = "/nix/store/8c98r6zlwn2d40qm7jnnrr2rdlqviszr-nix-2.3.10"; + x86_64-linux = "/nix/store/d1ppfhjhdwcsb4npfzyifv5z8i00fzsk-nix-2.3.11"; + i686-linux = "/nix/store/c6ikndcrzwpfn2sb5b9xb1f17p9b8iga-nix-2.3.11"; + aarch64-linux = "/nix/store/fb0lfrn0m8s197d264jzd64vhz9c8zbx-nix-2.3.11"; + x86_64-darwin = "/nix/store/qvb86ffv08q3r66qbd6nqifz425lyyhf-nix-2.3.11"; } diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index a16e74819a639..d808eebcc936e 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; }); |