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

Fix indentation

This commit is contained in:
Eelco Dolstra 2015-07-28 14:29:29 +02:00
parent c60e4016e7
commit 0ca10a445a
1 changed files with 29 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/modules.nix
View File

@ -281,7 +281,7 @@ rec {
inherit isDefined files; inherit isDefined files;
}; };
# Merge definitions of a value of a given type # Merge definitions of a value of a given type.
mergeDefinitions = loc: type: defs: rec { mergeDefinitions = loc: type: defs: rec {
defsFinal = defsFinal =
let let
@ -309,6 +309,7 @@ rec {
(type.merge loc defsFinal) defsFinal; (type.merge loc defsFinal) defsFinal;
isDefined = defsFinal != []; isDefined = defsFinal != [];
optionalValue = optionalValue =
if isDefined then { value = mergedValue; } if isDefined then { value = mergedValue; }
else {}; else {};