lixPackageSets.*.lix: test the correct Lix in passthru.tests

Previously always the top-level lix package would be used, which is obviously
not what we want.

Changed files
+18 -19
nixos
pkgs
tools
package-management
+8 -5
nixos/tests/installer.nix
···
grubUseEfi ? false,
enableOCR ? false,
meta ? { },
testSpecialisationConfig ? false,
testFlakeSwitch ? false,
testByAttrSwitch ? false,
···
isEfi = bootLoader == "systemd-boot" || (bootLoader == "grub" && grubUseEfi);
in
makeTest {
-
inherit enableOCR;
name = "installer-" + name;
meta = {
# put global maintainers here, individuals go into makeInstallerTest fkt call
···
# The (almost) simplest partitioning scheme: a swap partition and
# one big filesystem partition.
-
simple = makeInstallerTest "simple" simple-test-config;
-
lix-simple = makeInstallerTest "simple" simple-test-config // {
-
selectNixPackage = pkgs: pkgs.lix;
-
};
switchToFlake = makeInstallerTest "switch-to-flake" simple-test-config-flake;
···
grubUseEfi ? false,
enableOCR ? false,
meta ? { },
+
passthru ? { },
testSpecialisationConfig ? false,
testFlakeSwitch ? false,
testByAttrSwitch ? false,
···
isEfi = bootLoader == "systemd-boot" || (bootLoader == "grub" && grubUseEfi);
in
makeTest {
+
inherit enableOCR passthru;
name = "installer-" + name;
meta = {
# put global maintainers here, individuals go into makeInstallerTest fkt call
···
# The (almost) simplest partitioning scheme: a swap partition and
# one big filesystem partition.
+
simple = makeInstallerTest "simple" (
+
simple-test-config
+
// {
+
passthru.override = args: makeInstallerTest "simple" simple-test-config // args;
+
}
+
);
switchToFlake = makeInstallerTest "switch-to-flake" simple-test-config-flake;
+8 -12
nixos/tests/nix/misc.nix
···
let
inherit (pkgs) lib;
-
tests = {
-
default = testsForPackage { nixPackage = pkgs.nix; };
-
lix = testsForPackage { nixPackage = pkgs.lix; };
-
};
-
testsForPackage =
-
args:
-
lib.recurseIntoAttrs {
-
# If the attribute is not named 'test'
-
# You will break all the universe on the release-*.nix side of things.
-
# `discoverTests` relies on `test` existence to perform a `callTest`.
-
test = testMiscFeatures args;
-
passthru.override = args': testsForPackage (args // args');
};
testMiscFeatures =
{ nixPackage, ... }:
···
let
inherit (pkgs) lib;
+
tests.default = testsForPackage { nixPackage = pkgs.nix; };
+
testsForPackage = args: {
+
# If the attribute is not named 'test'
+
# You will break all the universe on the release-*.nix side of things.
+
# `discoverTests` relies on `test` existence to perform a `callTest`.
+
test = testMiscFeatures args // {
+
passthru.override = args': (testsForPackage (args // args')).test;
};
+
};
testMiscFeatures =
{ nixPackage, ... }:
+2 -2
pkgs/tools/package-management/lix/common-lix.nix
···
passthru = {
inherit aws-sdk-cpp boehmgc;
tests = {
-
misc = nixosTests.nix-misc.lix;
-
installer = nixosTests.installer.lix-simple;
};
};
···
passthru = {
inherit aws-sdk-cpp boehmgc;
tests = {
+
misc = nixosTests.nix-misc.default.passthru.override { nixPackage = finalAttrs.finalPackage; };
+
installer = nixosTests.installer.simple.override { selectNixPackage = _: finalAttrs.finalPackage; };
};
};