summary refs log tree commit diff
path: root/lib/types.nix
diff options
context:
space:
mode:
authorSilvan Mosberger <contact@infinisil.com>2020-01-03 05:22:11 +0100
committerSilvan Mosberger <contact@infinisil.com>2020-01-08 23:54:45 +0100
commit6525da6321a7272faa0c2b1c15ffd3501888e9b9 (patch)
treef8288ac36e592287aa0e068f5153f8a3e9d53745 /lib/types.nix
parent228a7b173e659a10c0f288f44e18e7ae050c78cb (diff)
downloadnixpkgs-6525da6321a7272faa0c2b1c15ffd3501888e9b9.tar
nixpkgs-6525da6321a7272faa0c2b1c15ffd3501888e9b9.tar.gz
nixpkgs-6525da6321a7272faa0c2b1c15ffd3501888e9b9.tar.bz2
nixpkgs-6525da6321a7272faa0c2b1c15ffd3501888e9b9.tar.lz
nixpkgs-6525da6321a7272faa0c2b1c15ffd3501888e9b9.tar.xz
nixpkgs-6525da6321a7272faa0c2b1c15ffd3501888e9b9.tar.zst
nixpkgs-6525da6321a7272faa0c2b1c15ffd3501888e9b9.zip
lib/types: Allow paths as submodule values
Diffstat (limited to 'lib/types.nix')
-rw-r--r--lib/types.nix8
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/types.nix b/lib/types.nix
index 4872a676657..7f2401c53d3 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -392,14 +392,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;