From 81694a7f54c518efb55da278d661c7569ee4867a Mon Sep 17 00:00:00 2001 From: Nicolas Pierron Date: Mon, 12 Oct 2009 15:50:59 +0000 Subject: [PATCH] * modules.nix: use catAttrs function instead of hand made code. svn path=/nixpkgs/trunk/; revision=17760 --- pkgs/lib/modules.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/lib/modules.nix b/pkgs/lib/modules.nix index becd786d8cd..a60b240beee 100644 --- a/pkgs/lib/modules.nix +++ b/pkgs/lib/modules.nix @@ -150,11 +150,7 @@ rec { moduleZip = funs: modules: lib.mapAttrs (name: fun: - fun ( - map (lib.getAttr name) ( - filter (builtins.hasAttr name) modules - ) - ) + fun (catAttrs name modules) ) funs; moduleMerge = path: modules: