movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 13:40:28 +03:00
Code Activity

Merge branch 'staging-next'

Browse source
This commit is contained in:
Vladimír Čunát 2020-06-10 16:13:48 +02:00
commit a5f5d020c6
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
132 changed files with 1132 additions and 567 deletions
Download patch file Download diff file Expand all files Collapse all files

5
nixos/modules/system/boot/kernel_config.nix
View file

@ -22,7 +22,7 @@ let
mergeFalseByDefault = locs: defs:
if defs == [] then abort "This case should never happen."
else if any (x: x == false) defs then false
else if any (x: x == false) (getValues defs) then false
else true;
kernelItem = types.submodule {
@ -55,6 +55,7 @@ let
default = false;
description = ''
Wether option should generate a failure when unused.
Upon merging values, mandatory wins over optional.
'';
};
};
@ -121,7 +122,7 @@ in
type = types.attrsOf kernelItem;
example = literalExample '' with lib.kernel; {
"9P_NET" = yes;
USB = optional yes;
USB = option yes;
MMC_BLOCK_MINORS = freeform "32";
}'';
description = ''