diff options
author | Matthieu Coudron <mattator@gmail.com> | 2020-04-01 03:20:33 +0200 |
---|---|---|
committer | Matthieu Coudron <mattator@gmail.com> | 2020-04-01 22:25:57 +0200 |
commit | b9a4e6953d0234cde64ac0cc55136adb3e92794b (patch) | |
tree | c0dfa75d9143bed36fca600b18b663efca864c87 /pkgs/os-specific/linux/kernel/generic.nix | |
parent | ae6bdcc53584aaf20211ce1814bea97ece08a248 (diff) | |
download | nixpkgs-b9a4e6953d0234cde64ac0cc55136adb3e92794b.tar nixpkgs-b9a4e6953d0234cde64ac0cc55136adb3e92794b.tar.gz nixpkgs-b9a4e6953d0234cde64ac0cc55136adb3e92794b.tar.bz2 nixpkgs-b9a4e6953d0234cde64ac0cc55136adb3e92794b.tar.lz nixpkgs-b9a4e6953d0234cde64ac0cc55136adb3e92794b.tar.xz nixpkgs-b9a4e6953d0234cde64ac0cc55136adb3e92794b.tar.zst nixpkgs-b9a4e6953d0234cde64ac0cc55136adb3e92794b.zip |
kernel: fix config generation
Addresses https://github.com/NixOS/nixpkgs/issues/71803: Kernel options are not merged as described, especially the "optional" aspects. The error silences legitimate warnings.
Diffstat (limited to 'pkgs/os-specific/linux/kernel/generic.nix')
-rw-r--r-- | pkgs/os-specific/linux/kernel/generic.nix | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index e6e1bd84236..a9d0cf45168 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -158,11 +158,8 @@ let ; }).config; - # structuredConfig = moduleStructuredConfig.settings; }; - - }; # end of configfile derivation kernel = (callPackage ./manual-config.nix {}) { |