* modules.nix: use catAttrs function instead of hand made code.
svn path=/nixpkgs/trunk/; revision=17760
This commit is contained in:
parent
19648abc05
commit
81694a7f54
@ -150,11 +150,7 @@ rec {
|
|||||||
|
|
||||||
moduleZip = funs: modules:
|
moduleZip = funs: modules:
|
||||||
lib.mapAttrs (name: fun:
|
lib.mapAttrs (name: fun:
|
||||||
fun (
|
fun (catAttrs name modules)
|
||||||
map (lib.getAttr name) (
|
|
||||||
filter (builtins.hasAttr name) modules
|
|
||||||
)
|
|
||||||
)
|
|
||||||
) funs;
|
) funs;
|
||||||
|
|
||||||
moduleMerge = path: modules:
|
moduleMerge = path: modules:
|
||||||
|
Loading…
Reference in New Issue
Block a user