diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-01-22 18:00:55 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-01-22 18:00:55 +0000 |
commit | 3c7375b75c80a4025db4de0385ff496359412538 (patch) | |
tree | d4c59e598743d45a34eb03a25c87f5f0f5b5a92a /pkgs/os-specific/linux/kernel/generic.nix | |
parent | 9fd4379ed110dc3ecb021a6d00f5a98bdc735e88 (diff) | |
parent | df318b860bdcecf0d2fed6443eb2f4f87ee10865 (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/os-specific/linux/kernel/generic.nix')
-rw-r--r-- | pkgs/os-specific/linux/kernel/generic.nix | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 7fc90ace2624f..a2f80505cd95d 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -40,7 +40,7 @@ modDirVersion ? null , # An attribute set whose attributes express the availability of - # certain features in this kernel. E.g. `{iwlwifi = true;}' + # certain features in this kernel. E.g. `{ia32Emulation = true;}' # indicates a kernel that provides Intel wireless support. Used in # NixOS to implement kernel-specific behaviour. features ? {} @@ -92,9 +92,7 @@ let # Combine the `features' attribute sets of all the kernel patches. kernelFeatures = lib.foldr (x: y: (x.features or {}) // y) ({ - iwlwifi = true; efiBootStub = true; - needsCifsUtils = true; netfilterRPFilter = true; ia32Emulation = true; } // features) kernelPatches; |