lib.deferredModule: Make it properly singular

2 files changed, 4 insertions, 2 deletions

diff --git a/lib/tests/modules/deferred-module.nix b/lib/tests/modules/deferred-module.nix
index e963c5a845c1f..d03c60b029bf1 100644
--- a/lib/tests/modules/deferred-module.nix
+++ b/lib/tests/modules/deferred-module.nix
@@ -12,7 +12,7 @@ in
     ({ config, ... }: {
       _file = "generic.nix";
       options.nodes = mkOption {
-        type = lazyAttrsOf (submodule { imports = config.default; });
+        type = lazyAttrsOf (submodule { imports = [ config.default ]; });
         default = {};
       };
       options.default = mkOption {
diff --git a/lib/types.nix b/lib/types.nix
index 68dfa5843dee5..354714b287333 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -549,7 +549,9 @@ rec {
       name = "deferredModule";
       description = "module";
       check = x: isAttrs x || isFunction x || path.check x;
-      merge = loc: defs: staticModules ++ map (def: lib.setDefaultModuleLocation "${def.file}, via option ${showOption loc}" def.value) defs;
+      merge = loc: defs: {
+        imports = staticModules ++ map (def: lib.setDefaultModuleLocation "${def.file}, via option ${showOption loc}" def.value) defs;
+      };
       inherit (submoduleWith { modules = staticModules; })
         getSubOptions
         getSubModules;