talexander/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

nixVersions.minimum: drop

Browse Source 
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.
This commit is contained in:
Wolfgang Walther 2025-07-24 19:08:08 +02:00
parent 5ccbba7d1d
commit cc3d2295b6
No known key found for this signature in database
GPG Key ID: B39893FA5F65CAE1
3 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ci/default.nix
View File

@ -128,8 +128,7 @@ rec {
parse = pkgs.lib.recurseIntoAttrs { parse = pkgs.lib.recurseIntoAttrs {
latest = pkgs.callPackage ./parse.nix { nix = pkgs.nixVersions.latest; }; latest = pkgs.callPackage ./parse.nix { nix = pkgs.nixVersions.latest; };
lix = pkgs.callPackage ./parse.nix { nix = pkgs.lix; }; lix = pkgs.callPackage ./parse.nix { nix = pkgs.lix; };
# TODO: Raise nixVersions.minimum to 2.24 and flip back to it. nix_2_24 = pkgs.callPackage ./parse.nix { nix = pkgs.nixVersions.nix_2_24; };
minimum = pkgs.callPackage ./parse.nix { nix = pkgs.nixVersions.nix_2_24; };
}; };
shell = import ../shell.nix { inherit nixpkgs system; }; shell = import ../shell.nix { inherit nixpkgs system; };
tarball = import ../pkgs/top-level/make-tarball.nix { tarball = import ../pkgs/top-level/make-tarball.nix {

2
lib/tests/release.nix
View File

@ -16,7 +16,7 @@
pkgsBB ? pkgs.pkgsBuildBuild, pkgsBB ? pkgs.pkgsBuildBuild,
nix ? pkgs-nixVersions.stable, nix ? pkgs-nixVersions.stable,
nixVersions ? [ nixVersions ? [
pkgs-nixVersions.minimum pkgs-nixVersions.nix_2_24
nix nix
pkgs-nixVersions.latest pkgs-nixVersions.latest
], ],

18
pkgs/tools/package-management/nix/default.nix
View File

@ -233,23 +233,6 @@ lib.makeExtensible (
latest = self.nix_2_30; 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 # Read ./README.md before bumping a major release
stable = addFallbackPathsCheck self.nix_2_28; 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_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."; 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."; unstable = throw "nixVersions.unstable has been removed. use nixVersions.latest or the nix flake.";
} }
) )