diff options
| author | github-actions[bot] | 2021-05-12 06:21:33 +0000 |
|---|---|---|
| committer | GitHub | 2021-05-12 06:21:33 +0000 |
| commit | d8fb37f470d79978d7addde761bf8d04877436be (patch) | |
| tree | c3cf756c2b5c713a25e889a6ae5c85f2381780dc /nixos | |
| parent | 5a513ae14b7cb0bf0c76398c5cd663f435ba52e9 (diff) | |
| parent | 4beb9ae8831de4cdb4a6f7e866955ee41d4e562b (diff) | |
Merge master into staging-next
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/tests/kernel-generic.nix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/nixos/tests/kernel-generic.nix b/nixos/tests/kernel-generic.nix index 17089141e9e4..a300609cf2bf 100644 --- a/nixos/tests/kernel-generic.nix +++ b/nixos/tests/kernel-generic.nix @@ -32,6 +32,7 @@ with pkgs; { linux_5_4 = makeKernelTest "5.4" linuxPackages_5_4; linux_5_10 = makeKernelTest "5.10" linuxPackages_5_10; linux_5_11 = makeKernelTest "5.11" linuxPackages_5_11; + linux_5_12 = makeKernelTest "5.12" linuxPackages_5_12; linux_testing = makeKernelTest "testing" linuxPackages_testing; } |