Merge pull request #76861 from Infinisil/paths-as-submodules

lib/types: Allow paths as submodule values

1 files changed, 5 insertions, 3 deletions

diff --git a/lib/types.nix b/lib/types.nix
index e86f6d3647611..e6f8417665702 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -430,14 +430,16 @@ rec {
           else unify (if shorthandOnlyDefinesConfig then { config = value; } else value);
 
         allModules = defs: modules ++ imap1 (n: { value, file }:
-          # Annotate the value with the location of its definition for better error messages
-          coerce (lib.modules.unifyModuleSyntax file "${toString file}-${toString n}") value
+          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
         ) defs;
 
       in
       mkOptionType rec {
         name = "submodule";
-        check = x: isAttrs x || isFunction x;
+        check = x: isAttrs x || isFunction x || path.check x;
         merge = loc: defs:
           (evalModules {
             modules = allModules defs;