diff options
author | Tim Steinbach <tim@nequissimus.com> | 2021-04-07 12:28:15 -0400 |
---|---|---|
committer | Tim Steinbach <NeQuissimus@users.noreply.github.com> | 2021-04-08 09:00:15 -0400 |
commit | d3d40b09fd3967a57aebd6219cc32b6db1c6dd7a (patch) | |
tree | db992d8ce46d2122e7e34c9ed13f918b1ea4be90 /pkgs/os-specific | |
parent | 491f0a677bf5f393caf2326de04acb0e2f6aed6a (diff) | |
download | nixpkgs-d3d40b09fd3967a57aebd6219cc32b6db1c6dd7a.tar nixpkgs-d3d40b09fd3967a57aebd6219cc32b6db1c6dd7a.tar.gz nixpkgs-d3d40b09fd3967a57aebd6219cc32b6db1c6dd7a.tar.bz2 nixpkgs-d3d40b09fd3967a57aebd6219cc32b6db1c6dd7a.tar.lz nixpkgs-d3d40b09fd3967a57aebd6219cc32b6db1c6dd7a.tar.xz nixpkgs-d3d40b09fd3967a57aebd6219cc32b6db1c6dd7a.tar.zst nixpkgs-d3d40b09fd3967a57aebd6219cc32b6db1c6dd7a.zip |
kernel: Add test for RC kernels
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r-- | pkgs/os-specific/linux/kernel/generic.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/kernel/linux-testing.nix | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index ffef30ec919..0a9c2d11fef 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -178,7 +178,7 @@ let passthru = { features = kernelFeatures; - inherit commonStructuredConfig isXen isZen isHardened isLibre; + inherit commonStructuredConfig isXen isZen isHardened isLibre modDirVersion; kernelOlder = lib.versionOlder version; kernelAtLeast = lib.versionAtLeast version; passthru = kernel.passthru // (removeAttrs passthru [ "passthru" ]); diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index eec306f2892..f0d41869346 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,4 +1,4 @@ -{ lib, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: +{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args: with lib; @@ -14,6 +14,8 @@ buildLinux (args // rec { sha256 = "0w0zk2byimdbcvn8myqaq0ab6lyd43493fnkv9a1407dimpxb03d"; }; + kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_testing ]; + # Should the testing kernels ever be built on Hydra? extraMeta.hydraPlatforms = []; |