diff options
| author | Florian Klink <flokli@flokli.de> | 2020-05-22 13:32:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-22 13:32:22 +0200 |
| commit | cfb4d0dfe329fd5a20f74c4763ddfa3cf571192a (patch) | |
| tree | 36b603fcf865967dede5ab7a4797cf068c668834 /lib/kernel.nix | |
| parent | 16d7f7edae6847e7a792d79b533b245f71907f46 (diff) | |
| parent | bc6b37e9678f3a095211764b8d4f8c12d8ea7d4e (diff) | |
| download | nixpkgs-cfb4d0dfe329fd5a20f74c4763ddfa3cf571192a.tar nixpkgs-cfb4d0dfe329fd5a20f74c4763ddfa3cf571192a.tar.gz nixpkgs-cfb4d0dfe329fd5a20f74c4763ddfa3cf571192a.tar.bz2 nixpkgs-cfb4d0dfe329fd5a20f74c4763ddfa3cf571192a.tar.lz nixpkgs-cfb4d0dfe329fd5a20f74c4763ddfa3cf571192a.tar.xz nixpkgs-cfb4d0dfe329fd5a20f74c4763ddfa3cf571192a.tar.zst nixpkgs-cfb4d0dfe329fd5a20f74c4763ddfa3cf571192a.zip | |
Merge pull request #84032 from teto/fix_kernel_merge
Fix kernel configuration merge
Diffstat (limited to 'lib/kernel.nix')
| -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 8045a228d05..ffcbc268b76 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 |