b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Use "or" in a few places

Browse source
This commit is contained in:
Eelco Dolstra 2012-12-04 12:28:57 +01:00
parent 3bdf95e05b
commit f4ec141869
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/lib/modules.nix
View file

@ -92,8 +92,7 @@ rec {
# used by generic closure to avoid duplicated imports. # used by generic closure to avoid duplicated imports.
key = key =
if isPath m then m if isPath m then m
else if m' ? key then m'.key else m'.key or (newModuleName origin index);
else newModuleName origin index;
}; };
getImports = m: m.imports or []; getImports = m: m.imports or [];
@ -145,7 +144,7 @@ rec {
evalDefinitions = opt: values: evalDefinitions = opt: values:
if opt ? type && opt.type.delayOnGlobalEval then if opt.type.delayOnGlobalEval or false then
map (delayPropertiesWithIter opt.type.iter opt.name) map (delayPropertiesWithIter opt.type.iter opt.name)
(evalLocalProperties values) (evalLocalProperties values)
else else
@ -235,7 +234,6 @@ rec {
source = m.key; source = m.key;
}) declarations; }) declarations;
hasOptions = values != []; hasOptions = values != [];
isOption = any lib.isOption values; isOption = any lib.isOption values;
@ -304,8 +302,7 @@ rec {
let opt = option.decl; in let opt = option.decl; in
opt.apply ( opt.apply (
if isNotDefined then if isNotDefined then
if opt ? default then opt.default opt.default or (throw "Not defined.")
else throw "Not defined."
else opt.merge defs else opt.merge defs
) )
); );