diff options
| author | Atemu <atemu.main@gmail.com> | 2021-05-02 13:55:33 +0200 |
|---|---|---|
| committer | Atemu <atemu.main@gmail.com> | 2021-08-23 19:57:46 +0200 |
| commit | 2b52f2b762fc664c04b691ca3f355477f4f65414 (patch) | |
| tree | 94e6a8c40a31c37641dfdb3b5ef1c9bc20b59852 /nixos/tests/kernel-generic.nix | |
| parent | 253aecf69ed7595aaefabde779aa6449195bebb7 (diff) | |
| download | nixpkgs-2b52f2b762fc664c04b691ca3f355477f4f65414.tar nixpkgs-2b52f2b762fc664c04b691ca3f355477f4f65414.tar.gz nixpkgs-2b52f2b762fc664c04b691ca3f355477f4f65414.tar.bz2 nixpkgs-2b52f2b762fc664c04b691ca3f355477f4f65414.tar.lz nixpkgs-2b52f2b762fc664c04b691ca3f355477f4f65414.tar.xz nixpkgs-2b52f2b762fc664c04b691ca3f355477f4f65414.tar.zst nixpkgs-2b52f2b762fc664c04b691ca3f355477f4f65414.zip | |
nixosTests.kernel-generic: simplify
Diffstat (limited to 'nixos/tests/kernel-generic.nix')
| -rw-r--r-- | nixos/tests/kernel-generic.nix | 36 |
1 files changed, 19 insertions, 17 deletions
diff --git a/nixos/tests/kernel-generic.nix b/nixos/tests/kernel-generic.nix index 5993d0e6ab7..04e3cae117a 100644 --- a/nixos/tests/kernel-generic.nix +++ b/nixos/tests/kernel-generic.nix @@ -6,8 +6,8 @@ with pkgs.lib; let - makeKernelTest = version: linuxPackages: (import ./make-test-python.nix ({ pkgs, ... }: { - name = "kernel-${version}"; + makeKernelTest = linuxPackages: (import ./make-test-python.nix ({ pkgs, ... }: { + name = "kernel-${linuxPackages.kernel.version}"; meta = with pkgs.lib.maintainers; { maintainers = [ nequissimus ]; }; @@ -23,20 +23,22 @@ let assert "${linuxPackages.kernel.modDirVersion}" in machine.succeed("uname -a") ''; }) args); -in -with pkgs; { - linux_4_4 = makeKernelTest "4.4" linuxPackages_4_4; - linux_4_9 = makeKernelTest "4.9" linuxPackages_4_9; - linux_4_14 = makeKernelTest "4.14" linuxPackages_4_14; - linux_4_19 = makeKernelTest "4.19" linuxPackages_4_19; - linux_5_4 = makeKernelTest "5.4" linuxPackages_5_4; - linux_5_10 = makeKernelTest "5.10" linuxPackages_5_10; - linux_5_13 = makeKernelTest "5.13" linuxPackages_5_13; + kernels = { + inherit (pkgs) + linuxPackages_4_4 + linuxPackages_4_9 + linuxPackages_4_14 + linuxPackages_4_19 + linuxPackages_5_4 + linuxPackages_5_10 + linuxPackages_5_13 - linux_hardened_4_14 = makeKernelTest "4.14" linuxPackages_4_14_hardened; - linux_hardened_4_19 = makeKernelTest "4.19" linuxPackages_4_19_hardened; - linux_hardened_5_4 = makeKernelTest "5.4" linuxPackages_5_4_hardened; - linux_hardened_5_10 = makeKernelTest "5.10" linuxPackages_5_10_hardened; + linuxPackages_4_14_hardened + linuxPackages_4_19_hardened + linuxPackages_5_4_hardened + linuxPackages_5_10_hardened - linux_testing = makeKernelTest "testing" linuxPackages_testing; -} + linuxPackages_testing; + }; + +in mapAttrs (_: kernel: makeKernelTest kernel) kernels |