diff --git a/lib/types.nix b/lib/types.nix index 847a4e902cab..de3c4f0d6030 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -376,16 +376,14 @@ rec { else unify (if shorthandOnlyDefinesConfig then { config = value; } else value); allModules = defs: modules ++ imap1 (n: { value, file }: - if isAttrs value || isFunction value then - # Annotate the value with the location of its definition for better error messages - coerce (lib.modules.unifyModuleSyntax file "${toString file}-${toString n}") value - else value + # Annotate the value with the location of its definition for better error messages + coerce (lib.modules.unifyModuleSyntax file "${toString file}-${toString n}") value ) defs; in mkOptionType rec { name = "submodule"; - check = x: isAttrs x || isFunction x || path.check x; + check = x: isAttrs x || isFunction x; merge = loc: defs: (evalModules { modules = allModules defs; diff --git a/nixos/doc/manual/development/option-types.xml b/nixos/doc/manual/development/option-types.xml index 173fdfcbbc83..1ec7e3efad71 100644 --- a/nixos/doc/manual/development/option-types.xml +++ b/nixos/doc/manual/development/option-types.xml @@ -257,9 +257,9 @@ A set of sub options o. - o can be an attribute set, a function - returning an attribute set, or a path to a file containing such a value. Submodules are used in - composed types to create modular options. This is equivalent to + o can be an attribute set or a function + returning an attribute set. Submodules are used in composed types to + create modular options. This is equivalent to types.submoduleWith { modules = toList o; shorthandOnlyDefinesConfig = true; }. Submodules are detailed in