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 /lib | |
| parent | ae6bdcc53584aaf20211ce1814bea97ece08a248 (diff) | |
| download | nixlib-b9a4e6953d0234cde64ac0cc55136adb3e92794b.tar nixlib-b9a4e6953d0234cde64ac0cc55136adb3e92794b.tar.gz nixlib-b9a4e6953d0234cde64ac0cc55136adb3e92794b.tar.bz2 nixlib-b9a4e6953d0234cde64ac0cc55136adb3e92794b.tar.lz nixlib-b9a4e6953d0234cde64ac0cc55136adb3e92794b.tar.xz nixlib-b9a4e6953d0234cde64ac0cc55136adb3e92794b.tar.zst nixlib-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 'lib')
| -rw-r--r-- | lib/kernel.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/kernel.nix b/lib/kernel.nix index 2ce19f8cb68c..a0f986ee1160 100644 --- a/lib/kernel.nix +++ b/lib/kernel.nix @@ -8,10 +8,10 @@ with lib; option = x: x // { optional = true; }; - yes = { tristate = "y"; }; - no = { tristate = "n"; }; - module = { tristate = "m"; }; - freeform = x: { freeform = x; }; + yes = { tristate = "y"; optional = false; }; + no = { tristate = "n"; optional = false; }; + module = { tristate = "m"; optional = false; }; + freeform = x: { freeform = x; optional = false; }; /* Common patterns/legacy used in common-config/hardened-config.nix |