From b9a4e6953d0234cde64ac0cc55136adb3e92794b Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Wed, 1 Apr 2020 03:20:33 +0200 Subject: 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. --- lib/kernel.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lib/kernel.nix') diff --git a/lib/kernel.nix b/lib/kernel.nix index 2ce19f8cb68c0..a0f986ee11602 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 -- cgit 1.4.1