diff options
| -rw-r--r-- | pkgs/lib/modules.nix | 48 |
1 files changed, 34 insertions, 14 deletions
diff --git a/pkgs/lib/modules.nix b/pkgs/lib/modules.nix index 2f1382ac93c..b7c3062f6a8 100644 --- a/pkgs/lib/modules.nix +++ b/pkgs/lib/modules.nix @@ -32,16 +32,10 @@ rec { else f; - moduleClosure = initModules: args: + # Convert module to a set which has imports / options and config + # attributes. + unifyModuleSyntax = m: let - moduleImport = m: - (applyIfFunction (importIfPath m) args) // { - # used by generic closure to avoid duplicated imports. - key = m; - }; - - removeKeys = list: map (m: removeAttrs m ["key"]) list; - getImports = m: if m ? config || m ? options then attrByPath ["imports"] [] m @@ -51,13 +45,39 @@ rec { getImportedPaths = m: filter isPath (getImports m); getImportedSets = m: filter (x: !isPath x) (getImports m); - inlineImportedSets = list: - lib.concatMap (m:[m] ++ map moduleImport (getImportedSets m)) list; + getConfig = m: + removeAttrs (delayProperties m) ["require"]; + in + if m ? config || m ? options then + m + else + { + imports = getImportedPaths m; + config = getConfig m; + } // ( + if getImportedSets m != [] then + assert tail (getImportedSets m) == []; + { options = head (getImportedSets m); } + else + {} + ); + + moduleClosure = initModules: args: + let + moduleImport = m: lib.addErrorContext "Import module ${m}." ( + (unifyModuleSyntax (applyIfFunction (import m) args)) // { + # used by generic closure to avoid duplicated imports. + key = m; + paths = [ m ]; + } + ); + + getImports = m: attrByPath ["imports"] [] m; in - removeKeys (inlineImportedSets (lazyGenericClosure { + lazyGenericClosure { startSet = map moduleImport initModules; - operator = m: map moduleImport (getImportedPaths m); - })); + operator = m: map moduleImport (getImports m); + }; selectDeclsAndDefs = modules: lib.concatMap (m: |