lol
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

lib.types.deferredModule: Allow path-typed module references

+5 -4
+1 -3
lib/tests/modules/deferred-module.nix
··· 34 34 35 35 { 36 36 _file = "default-a-is-b.nix"; 37 - default = { config, ... }: { 38 - settingsDict.a = config.settingsDict.b; 39 - }; 37 + default = ./define-settingsDict-a-is-b.nix; 40 38 } 41 39 42 40 {
+3
lib/tests/modules/define-settingsDict-a-is-b.nix
··· 1 + { config, ... }: { 2 + settingsDict.a = config.settingsDict.b; 3 + }
+1 -1
lib/types.nix
··· 543 543 deferredModule = mkOptionType { 544 544 name = "deferredModule"; 545 545 description = "module"; 546 - check = t: isAttrs t || isFunction t; 546 + check = x: isAttrs x || isFunction x || path.check x; 547 547 merge = loc: defs: map (def: lib.setDefaultModuleLocation "${def.file}, via option ${showOption loc}" def.value) defs; 548 548 }; 549 549