Skip to content

Commit

Permalink
kernel: fix config generation
Browse files Browse the repository at this point in the history
Addresses NixOS/nixpkgs#71803:
Kernel options are not merged as described, especially the "optional"
aspects. The error silences legitimate warnings.
  • Loading branch information
teto committed Apr 1, 2020
1 parent 534817a commit 17e4204
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions lib/kernel.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 17e4204

Please sign in to comment.