+1
-1
lib/tests/modules/deferred-module.nix
+1
-1
lib/tests/modules/deferred-module.nix
+3
-1
lib/types.nix
+3
-1
lib/types.nix
···-merge = loc: defs: staticModules ++ map (def: lib.setDefaultModuleLocation "${def.file}, via option ${showOption loc}" def.value) defs;+imports = staticModules ++ map (def: lib.setDefaultModuleLocation "${def.file}, via option ${showOption loc}" def.value) defs;
+3
-2
nixos/doc/manual/development/option-types.section.md
+3
-2
nixos/doc/manual/development/option-types.section.md
···
+12
-8
nixos/doc/manual/from_md/development/option-types.section.xml
+12
-8
nixos/doc/manual/from_md/development/option-types.section.xml
···