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

* Options / config: these should be attrsets, not lists (IMHO). 

svn path=/nixpkgs/trunk/; revision=16359
This commit is contained in:
Eelco Dolstra 2009-07-14 16:22:42 +00:00
parent 7f080535c4
commit 80cab44fce
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/lib/modules.nix
View File

@ -62,8 +62,8 @@ rec {
selectDeclsAndDefs = modules: selectDeclsAndDefs = modules:
lib.concatMap (m: lib.concatMap (m:
if m ? config || m ? options then if m ? config || m ? options then
attrByPath ["options"] [] m [ (attrByPath ["options"] {} m) ]
++ attrByPath ["config"] [] m ++ [ (attrByPath ["config"] {} m) ]
else else
[ m ] [ m ]
) modules; ) modules;