From ff7ad14c4466a188c3e1273774c3cc2ba1b996fc Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Mon, 31 Jan 2022 16:42:34 -0800 Subject: [PATCH 1/2] nixVersions.stable: point to nix_2_6 --- pkgs/tools/package-management/nix/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index f389da8b4b0b..ffbe598b9291 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -62,8 +62,7 @@ in lib.makeExtensible (self: { sha256 = "sha256-xEPeMcNJVOeZtoN+d+aRwolpW8mFSEQx76HTRdlhPhg="; }; - # FIXME: nix_2_6 is broken on aarch64-darwin for now. - stable = self.nix_2_5; + stable = self.nix_2_6; unstable = lib.lowPrio (common rec { version = "2.7"; From f46347fa66580249bd9709be554fb50f404985d9 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Mon, 31 Jan 2022 18:53:43 -0800 Subject: [PATCH 2/2] nix-fallback-paths: update to 2.6.0 --- nixos/modules/installer/tools/nix-fallback-paths.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix index 065cea470fbb..31aeaad80d60 100644 --- a/nixos/modules/installer/tools/nix-fallback-paths.nix +++ b/nixos/modules/installer/tools/nix-fallback-paths.nix @@ -1,7 +1,7 @@ { - x86_64-linux = "/nix/store/hapw7q1fkjxvprnkcgw9ppczavg4daj2-nix-2.4"; - i686-linux = "/nix/store/8qlvh8pp5j8wgrzj3is2jlbhgrwgsiy9-nix-2.4"; - aarch64-linux = "/nix/store/h48lkygcqj4hdibbdnpl67q7ks6vkrd6-nix-2.4"; - x86_64-darwin = "/nix/store/c3mvzszvyzakvcp9spnjvsb8m2bpjk7m-nix-2.4"; - aarch64-darwin = "/nix/store/hbfqs62r0hga2yr4zi5kc7fzhf71bq9n-nix-2.4"; + x86_64-linux = "/nix/store/67amfijcvhqfgz4bwf2izsvbnklwjbvk-nix-2.6.0"; + i686-linux = "/nix/store/kinl99f619b2xsma4qnzhidbp65axyzm-nix-2.6.0"; + aarch64-linux = "/nix/store/8zpm63nn7k4n1alp9a0fcilpgc8j014z-nix-2.6.0"; + x86_64-darwin = "/nix/store/hw5v03wnc0k1pwgiyhblwlxb1fx5zyx8-nix-2.6.0"; + aarch64-darwin = "/nix/store/669p1vjnzi56fib98qczwlaglcwcnip4-nix-2.6.0"; }