mirror of
https://github.com/CHN-beta/nixpkgs.git
synced 2026-01-11 18:32:23 +08:00
lib/tests: don't test with Nix 2.3 anymore
The `nixVersions.minimum` alias has been removed on unstable, so the
TODO is not needed anymore.
The lib tests can't be run with Nix 2.3 anymore, because this version is
not available on unstable anymore - and thus also not in the pinned
nixpkgs that CI is run with.
(cherry picked from commit cc3d2295b6)
This commit is contained in:
@@ -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 {
|
||||||
|
|||||||
@@ -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
|
||||||
],
|
],
|
||||||
|
|||||||
Reference in New Issue
Block a user