public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #84032 from teto/fix_kernel_merge

Browse Source 
Fix kernel configuration merge
This commit is contained in:
Florian Klink
2020-05-22 13:32:22 +02:00
committed by GitHub
parent 16d7f7edae bc6b37e967
commit cfb4d0dfe3
5 changed files with 68 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/kernel.nix
View File

@@ -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