lib.modules: Default shorthandOnlyDefinesConfig to true when null

NixOS · Mar 2, 2022 · 28aeae2 · 28aeae2
1 parent 6b077c4
commit 28aeae2
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/lib/types.nix b/lib/types.nix
@@ -562,9 +562,13 @@ rec {
       let
         inherit (lib.modules) evalModules;
 
+        shorthandToModule = if shorthandOnlyDefinesConfig == false
+          then value: value
+          else value: { config = value; };
+
         coerce = unify: value: if isFunction value
           then setFunctionArgs (args: unify (value args)) (functionArgs value)
-          else unify (if shorthandOnlyDefinesConfig then { config = value; } else value);
+          else unify (shorthandToModule value);
 
         allModules = defs: imap1 (n: { value, file }:
           if isAttrs value || isFunction value then