diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2021-04-08 22:42:26 -0400 |
|---|---|---|
| committer | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2021-04-08 22:42:26 -0400 |
| commit | 219590673ce4b8c01d595e64bff21d54a72191b7 (patch) | |
| tree | 2b577ead908bf018df37b1241ba7a01d8659acdb /pkgs/os-specific/linux/kernel/generic.nix | |
| parent | 625ce6c7f66c0b2ccae30f95cdd9e48feed8561c (diff) | |
| parent | c99b6f5343030d7e5e3feef8b6c596f7644310a0 (diff) | |
| download | nixpkgs-219590673ce4b8c01d595e64bff21d54a72191b7.tar nixpkgs-219590673ce4b8c01d595e64bff21d54a72191b7.tar.gz nixpkgs-219590673ce4b8c01d595e64bff21d54a72191b7.tar.bz2 nixpkgs-219590673ce4b8c01d595e64bff21d54a72191b7.tar.lz nixpkgs-219590673ce4b8c01d595e64bff21d54a72191b7.tar.xz nixpkgs-219590673ce4b8c01d595e64bff21d54a72191b7.tar.zst nixpkgs-219590673ce4b8c01d595e64bff21d54a72191b7.zip | |
Merge branch 'staging-next' into staging
Conflicts: pkgs/development/python-modules/panel/default.nix pkgs/os-specific/linux/kernel/generic.nix pkgs/servers/home-assistant/default.nix
Diffstat (limited to 'pkgs/os-specific/linux/kernel/generic.nix')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/generic.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 1c289d86002..68a1fcdb0e6 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -54,7 +54,7 @@ , autoModules ? stdenv.hostPlatform.linux-kernel.autoModules , preferBuiltin ? stdenv.hostPlatform.linux-kernel.preferBuiltin or false , kernelArch ? stdenv.hostPlatform.linuxArch - +, kernelTests ? [] , ... }: @@ -175,11 +175,12 @@ let passthru = { features = kernelFeatures; - inherit commonStructuredConfig isZen isHardened isLibre; + inherit commonStructuredConfig isZen isHardened isLibre modDirVersion; isXen = lib.warn "The isXen attribute is deprecated. All Nixpkgs kernels that support it now have Xen enabled." true; kernelOlder = lib.versionOlder version; kernelAtLeast = lib.versionAtLeast version; passthru = kernel.passthru // (removeAttrs passthru [ "passthru" ]); + tests = kernelTests; }; in lib.extendDerivation true passthru kernel |