diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-24 14:48:02 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-24 14:49:59 +0200 |
| commit | a4f1f4b3673727ddbc5758ea5f0836d013fcc111 (patch) | |
| tree | 746c3800413f1f1d1b3d664de227cecc4cba272e /lib | |
| parent | 0d76e1cb94ffda0412da9e33e1fd554198248732 (diff) | |
| download | nixpkgs-a4f1f4b3673727ddbc5758ea5f0836d013fcc111.tar nixpkgs-a4f1f4b3673727ddbc5758ea5f0836d013fcc111.tar.gz nixpkgs-a4f1f4b3673727ddbc5758ea5f0836d013fcc111.tar.bz2 nixpkgs-a4f1f4b3673727ddbc5758ea5f0836d013fcc111.tar.lz nixpkgs-a4f1f4b3673727ddbc5758ea5f0836d013fcc111.tar.xz nixpkgs-a4f1f4b3673727ddbc5758ea5f0836d013fcc111.tar.zst nixpkgs-a4f1f4b3673727ddbc5758ea5f0836d013fcc111.zip | |
Small cleanup
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/misc.nix | 4 | ||||
| -rw-r--r-- | lib/modules.nix | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/lib/misc.nix b/lib/misc.nix index 19e5081009d..c128b9af9d8 100644 --- a/lib/misc.nix +++ b/lib/misc.nix @@ -206,9 +206,7 @@ rec { in work startSet [] []; - genericClosure = - if builtins ? genericClosure then builtins.genericClosure - else lazyGenericClosure; + genericClosure = builtins.genericClosure or lazyGenericClosure; innerModifySumArgs = f: x: a: b: if b == null then (f a b) // x else innerModifySumArgs f x (a // b); diff --git a/lib/modules.nix b/lib/modules.nix index acd10e7bf57..f914947e784 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -185,8 +185,7 @@ rec { ) funs; - moduleMerge = path: modules: - let modules_ = modules; in + moduleMerge = path: modules_: let addName = name: if path == "" then name else path + "." + name; |