summary refs log tree commit diff
path: root/nixos/tests/kernel-generic.nix
diff options
context:
space:
mode:
authorDominik Xaver Hörl <hoe.dom@gmx.de>2021-11-01 10:18:46 +0100
committerDominik Xaver Hörl <hoe.dom@gmx.de>2021-11-01 10:20:39 +0100
commit256a798f826696ba7babda4cd150cb952519ff29 (patch)
tree36f461b50593856168c5aa8f7f1d7947471e64be /nixos/tests/kernel-generic.nix
parent4fb4b64362d0e00d2fb496626279f88b6255d26d (diff)
downloadnixpkgs-256a798f826696ba7babda4cd150cb952519ff29.tar
nixpkgs-256a798f826696ba7babda4cd150cb952519ff29.tar.gz
nixpkgs-256a798f826696ba7babda4cd150cb952519ff29.tar.bz2
nixpkgs-256a798f826696ba7babda4cd150cb952519ff29.tar.lz
nixpkgs-256a798f826696ba7babda4cd150cb952519ff29.tar.xz
nixpkgs-256a798f826696ba7babda4cd150cb952519ff29.tar.zst
nixpkgs-256a798f826696ba7babda4cd150cb952519ff29.zip
nixos/kernel: test all upstream kernels, reference linuxKernel directly
Diffstat (limited to 'nixos/tests/kernel-generic.nix')
-rw-r--r--nixos/tests/kernel-generic.nix24
1 files changed, 8 insertions, 16 deletions
diff --git a/nixos/tests/kernel-generic.nix b/nixos/tests/kernel-generic.nix
index 192dc810d7a..3fdd3995b7a 100644
--- a/nixos/tests/kernel-generic.nix
+++ b/nixos/tests/kernel-generic.nix
@@ -23,22 +23,14 @@ let
         assert "${linuxPackages.kernel.modDirVersion}" in machine.succeed("uname -a")
       '';
   }) args);
-  kernels = {
-    inherit (pkgs)
-      linuxPackages_4_4
-      linuxPackages_4_9
-      linuxPackages_4_14
-      linuxPackages_4_19
-      linuxPackages_5_4
-      linuxPackages_5_10
-      linuxPackages_5_14
-
-      linuxPackages_4_14_hardened
-      linuxPackages_4_19_hardened
-      linuxPackages_5_4_hardened
-      linuxPackages_5_10_hardened
-
-      linuxPackages_testing;
+  kernels = pkgs.linuxKernel.vanillaPackages // {
+    inherit (pkgs.linuxKernel.packages)
+      linux_4_14_hardened
+      linux_4_19_hardened
+      linux_5_4_hardened
+      linux_5_10_hardened
+
+      linux_testing;
   };
 
 in mapAttrs (_: lP: testsForLinuxPackages lP) kernels // {