From 6034f6087ec815108c0776d0bfd432c8f7f595b0 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sun, 20 Oct 2024 12:42:34 +0200 Subject: [PATCH] linux: change tests to attrset --- pkgs/os-specific/linux/kernel/generic.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 49c9594f8f7f0b..046fb3fe612026 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -71,7 +71,7 @@ lib.makeOverridable ({ # The kernel source tarball. , autoModules ? stdenv.hostPlatform.linux-kernel.autoModules , preferBuiltin ? stdenv.hostPlatform.linux-kernel.preferBuiltin or false , kernelArch ? stdenv.hostPlatform.linuxArch -, kernelTests ? [] +, kernelTests ? {} , stdenv ? args'.stdenv , buildPackages ? args'.buildPackages @@ -281,12 +281,12 @@ kernel.overrideAttrs (finalAttrs: previousAttrs: { modDirVersion = throw (explain "modDirVersion"); }))).version emptyFile; - in [ - (nixosTests.kernel-generic.passthru.testsForKernel overridableKernel) - versionDoesNotDependOnPatchesEtc + in { + inherit versionDoesNotDependOnPatchesEtc; + testsForKernel = nixosTests.kernel-generic.passthru.testsForKernel overridableKernel; # Disabled by default, because the infinite recursion is hard to understand. The other test's error is better and produces a shorter trace. - # versionDoesNotDependOnPatchesEtcNixOS - ] ++ kernelTests; + # inherit versionDoesNotDependOnPatchesEtcNixOS; + } // kernelTests; }; }));