From cc3d2295b642f3d61faaa7335f79e63b5d10996e Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Thu, 24 Jul 2025 19:08:08 +0200 Subject: [PATCH] nixVersions.minimum: drop The concept of this alias becomes questionable once we move past 2.18, where Lix was forked. We should probably move to a feature-detection based approach for lib/minver.nix eventually, too. --- ci/default.nix | 3 +-- lib/tests/release.nix | 2 +- pkgs/tools/package-management/nix/default.nix | 18 +----------------- 3 files changed, 3 insertions(+), 20 deletions(-) diff --git a/ci/default.nix b/ci/default.nix index 2bae87eca058..46c3c77064b9 100644 --- a/ci/default.nix +++ b/ci/default.nix @@ -128,8 +128,7 @@ rec { parse = pkgs.lib.recurseIntoAttrs { latest = pkgs.callPackage ./parse.nix { nix = pkgs.nixVersions.latest; }; lix = pkgs.callPackage ./parse.nix { nix = pkgs.lix; }; - # TODO: Raise nixVersions.minimum to 2.24 and flip back to it. - minimum = pkgs.callPackage ./parse.nix { nix = pkgs.nixVersions.nix_2_24; }; + nix_2_24 = pkgs.callPackage ./parse.nix { nix = pkgs.nixVersions.nix_2_24; }; }; shell = import ../shell.nix { inherit nixpkgs system; }; tarball = import ../pkgs/top-level/make-tarball.nix { diff --git a/lib/tests/release.nix b/lib/tests/release.nix index 5a1752010745..1f8c666eab01 100644 --- a/lib/tests/release.nix +++ b/lib/tests/release.nix @@ -16,7 +16,7 @@ pkgsBB ? pkgs.pkgsBuildBuild, nix ? pkgs-nixVersions.stable, nixVersions ? [ - pkgs-nixVersions.minimum + pkgs-nixVersions.nix_2_24 nix pkgs-nixVersions.latest ], diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 19e86764f900..80bb48013817 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -233,23 +233,6 @@ lib.makeExtensible ( latest = self.nix_2_30; - # The minimum Nix version supported by Nixpkgs - # Note that some functionality *might* have been backported into this Nix version, - # making this package an inaccurate representation of what features are available - # in the actual lowest minver.nix *patch* version. - minimum = - let - minver = import ../../../../lib/minver.nix; - major = lib.versions.major minver; - minor = lib.versions.minor minver; - attribute = "nix_${major}_${minor}"; - nix = self.${attribute}; - in - if !self ? ${attribute} then - throw "The minimum supported Nix version is ${minver} (declared in lib/minver.nix), but pkgs.nixVersions.${attribute} does not exist." - else - nix; - # Read ./README.md before bumping a major release stable = addFallbackPathsCheck self.nix_2_28; } @@ -269,6 +252,7 @@ lib.makeExtensible ( nix_2_27 = throw "nix_2_27 has been removed. use nix_2_28."; nix_2_25 = throw "nix_2_25 has been removed. use nix_2_28."; + minimum = throw "nixVersions.minimum has been removed. Use a specific version instead."; unstable = throw "nixVersions.unstable has been removed. use nixVersions.latest or the nix flake."; } )