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

Small cleanup

Browse Source
This commit is contained in:
Eelco Dolstra 2013-10-24 14:48:02 +02:00
parent 0d76e1cb94
commit a4f1f4b367
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/misc.nix
View File

@ -206,9 +206,7 @@ rec {
in in
work startSet [] []; work startSet [] [];
genericClosure = genericClosure = builtins.genericClosure or lazyGenericClosure;
if builtins ? genericClosure then builtins.genericClosure
else lazyGenericClosure;
innerModifySumArgs = f: x: a: b: if b == null then (f a b) // x else innerModifySumArgs = f: x: a: b: if b == null then (f a b) // x else
innerModifySumArgs f x (a // b); innerModifySumArgs f x (a // b);

3
lib/modules.nix
View File

@ -185,8 +185,7 @@ rec {
) funs; ) funs;
moduleMerge = path: modules: moduleMerge = path: modules_:
let modules_ = modules; in
let let
addName = name: addName = name:
if path == "" then name else path + "." + name; if path == "" then name else path + "." + name;