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

Support "imports" in abbreviated modules 

In abbreviated modules (those without a "config" attribute), you can
use "require", but it doesn't behave in the same way.  For consistency
we should use "imports" everywhere.
This commit is contained in:
Eelco Dolstra 2013-09-04 11:49:56 +02:00
parent e55c0bcaaa
commit 62585a363f
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/lib/modules.nix
View File

@ -46,25 +46,21 @@ rec {
unifyModuleSyntax = m: unifyModuleSyntax = m:
let let
delayedModule = delayProperties m; delayedModule = delayProperties m;
getImports =
if m ? config || m ? options then
m.imports or []
else
toList (rmProperties (delayedModule.require or []));
getImports =
toList (rmProperties (delayedModule.require or []));
getImportedPaths = filter isPath getImports; getImportedPaths = filter isPath getImports;
getImportedSets = filter (x: !isPath x) getImports; getImportedSets = filter (x: !isPath x) getImports;
getConfig = getConfig =
removeAttrs delayedModule ["require" "key"]; removeAttrs delayedModule ["require" "key" "imports"];
in in
if isModule m then if isModule m then
{ key = "<unknown location>"; } // m { key = "<unknown location>"; } // m
else else
{ { key = "<unknown location>";
key = "<unknown location>"; imports = (m.imports or []) ++ getImportedPaths;
imports = getImportedPaths;
config = getConfig; config = getConfig;
} // ( } // (
if getImportedSets != [] then if getImportedSets != [] then