From 015a48f58268b1032992ea51fd5e49f1d0c39dc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 7 Apr 2025 10:44:16 +0200 Subject: [PATCH 1/3] nixVersions.latest: 2.26 -> 2.28 --- 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 14ef652e076e..4cec9c721c1d 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -211,7 +211,7 @@ lib.makeExtensible ( nix_2_28 = addTests "nix_2_28" self.nixComponents_2_28.nix-everything; - latest = self.nix_2_26; + latest = self.nix_2_28; # The minimum Nix version supported by Nixpkgs # Note that some functionality *might* have been backported into this Nix version, From 2ddb083f2eea920323f42da8493221640210db37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 7 Apr 2025 11:16:23 +0200 Subject: [PATCH 2/3] nixVersions: use tags instead of commits --- pkgs/tools/package-management/nix/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 4cec9c721c1d..c189eac1b03a 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -167,14 +167,14 @@ lib.makeExtensible ( self_attribute_name = "nix_2_25"; }; - nixComponents_2_26 = nixDependencies.callPackage ./modular/packages.nix { + nixComponents_2_26 = nixDependencies.callPackage ./modular/packages.nix rec { version = "2.26.3"; inherit (self.nix_2_24.meta) maintainers; otherSplices = generateSplicesForNixComponents "nixComponents_2_26"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "42fc03dd1f12df2d9152303f3fb8bf22b746462c"; + tag = version; hash = "sha256-5ZV8YqU8mfFmoAMiUEuBqNwk0T3vUR//x1D12BiYCeY="; }; }; @@ -183,14 +183,14 @@ lib.makeExtensible ( # depend on the components they need in `nixComponents_2_26`. nix_2_26 = addTests "nix_2_26" self.nixComponents_2_26.nix-everything; - nixComponents_2_27 = nixDependencies.callPackage ./modular/packages.nix { + nixComponents_2_27 = nixDependencies.callPackage ./modular/packages.nix rec { version = "2.27.1"; inherit (self.nix_2_24.meta) maintainers; otherSplices = generateSplicesForNixComponents "nixComponents_2_27"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "9cb662df7442a1e2c4600fb8ecb2ad613ebc5a95"; + tag = version; hash = "sha256-rBPulEBpn4IiqkPsetuh7BRzT2iGCzZYnogTAsbrvhU="; }; }; @@ -199,6 +199,7 @@ lib.makeExtensible ( nixComponents_2_28 = nixDependencies.callPackage ./modular/packages.nix { version = "2.28.1pre"; + nixComponents_2_28 = nixDependencies.callPackage ./modular/packages.nix rec { inherit (self.nix_2_24.meta) maintainers; otherSplices = generateSplicesForNixComponents "nixComponents_2_28"; src = fetchFromGitHub { From 96877bcad6c6a16e84332b2591b5b4119e206f96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 7 Apr 2025 11:18:25 +0200 Subject: [PATCH 3/3] nixVersions.2_28: 2.28.1pre -> 2.28.1 --- pkgs/tools/package-management/nix/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index c189eac1b03a..b85d0b605f36 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -197,16 +197,15 @@ lib.makeExtensible ( nix_2_27 = addTests "nix_2_27" self.nixComponents_2_27.nix-everything; - nixComponents_2_28 = nixDependencies.callPackage ./modular/packages.nix { - version = "2.28.1pre"; nixComponents_2_28 = nixDependencies.callPackage ./modular/packages.nix rec { + version = "2.28.1"; inherit (self.nix_2_24.meta) maintainers; otherSplices = generateSplicesForNixComponents "nixComponents_2_28"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "9cdf72beaa77f1e6c0faed44872b83783051f20d"; - hash = "sha256-0sk7cGOdfUA6/AamSsuURHdILxSyw+s2zl7CDaSsawo="; + rev = version; + hash = "sha256-R+HAPvD+AjiyRHZP/elkvka33G499EKT8ntyF/EPPRI="; }; };