From a59a1479ed300a4d2d21d480f936305a49d610a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 11 Mar 2025 13:24:47 +0100 Subject: [PATCH 1/2] nixVersions.latest: 2.25 -> 2.26 --- pkgs/tools/package-management/nix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index f6cb97c7d1575..c5c5e4910ba70 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -201,7 +201,7 @@ in lib.makeExtensible (self: ({ self_attribute_name = "git"; }; - latest = self.nix_2_25; + latest = self.nix_2_26; # The minimum Nix version supported by Nixpkgs # Note that some functionality *might* have been backported into this Nix version, From a09345e0e7f9fbcaff91b54e8a5f1191c92eee24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 11 Mar 2025 13:37:28 +0100 Subject: [PATCH 2/2] nil: don't depend on latest nix version I think this was added when we didn't had nix 2.24 as the default. I don't think this should be needed anymore? --- pkgs/by-name/ni/nil/package.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ni/nil/package.nix b/pkgs/by-name/ni/nil/package.nix index 9d9a59704211a..2a60b5c08343d 100644 --- a/pkgs/by-name/ni/nil/package.nix +++ b/pkgs/by-name/ni/nil/package.nix @@ -2,7 +2,7 @@ lib, rustPlatform, fetchFromGitHub, - nixVersions, + nix, nix-update-script, }: @@ -20,9 +20,7 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-7TR/xTc66WpPszJDrpisVvHXl2+FGrUOskZAkGyY04Q="; - nativeBuildInputs = [ - (lib.getBin nixVersions.latest) - ]; + nativeBuildInputs = [ nix ]; env.CFG_RELEASE = version;