From c6efa35204dbc8cf2fcb8d28a6b2591c60119eb5 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Thu, 24 Jul 2025 19:08:08 +0200 Subject: [PATCH] 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 cc3d2295b642f3d61faaa7335f79e63b5d10996e) --- ci/default.nix | 3 +-- lib/tests/release.nix | 2 +- 2 files changed, 2 insertions(+), 3 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 ],