diff --git a/pkgs/lib/modules.nix b/pkgs/lib/modules.nix index b7c3062f6a8d..7e1d2f9d56f3 100644 --- a/pkgs/lib/modules.nix +++ b/pkgs/lib/modules.nix @@ -64,8 +64,10 @@ rec { moduleClosure = initModules: args: let - moduleImport = m: lib.addErrorContext "Import module ${m}." ( - (unifyModuleSyntax (applyIfFunction (import m) args)) // { + moduleImport = m: lib.addErrorContext + "Import module ${(if builtins.isAttrs m then "{...}" else m)}." ( + (unifyModuleSyntax (applyIfFunction + (if builtins.isAttrs m then m else import m) args)) // { # used by generic closure to avoid duplicated imports. key = m; paths = [ m ]; @@ -88,4 +90,4 @@ rec { [ m ] ) modules; -} \ No newline at end of file +}