From cd2e5bd46c016666f8cd3c00f95d692479c3027d Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Fri, 20 Jun 2025 08:30:58 +0200 Subject: [PATCH] types/merge: move 'configuration' of submodules into nested attribute set --- lib/tests/modules.sh | 4 ++-- lib/tests/modules/composed-types-valueMeta.nix | 4 ++-- lib/types.nix | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index f48f04ae985a..bbc4ee9bdfe6 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -768,8 +768,8 @@ checkConfigOutput '2' config.listOfResult ./types-valueMeta.nix # Check that composed types expose the 'valueMeta' # attrsOf submodule (also on merged options,types) -checkConfigOutput '42' options.attrsOfModule.valueMeta.attrs.foo.options.bar.value ./composed-types-valueMeta.nix -checkConfigOutput '42' options.mergedAttrsOfModule.valueMeta.attrs.foo.options.bar.value ./composed-types-valueMeta.nix +checkConfigOutput '42' options.attrsOfModule.valueMeta.attrs.foo.configuration.options.bar.value ./composed-types-valueMeta.nix +checkConfigOutput '42' options.mergedAttrsOfModule.valueMeta.attrs.foo.configuration.options.bar.value ./composed-types-valueMeta.nix # listOf submodule (also on merged options,types) checkConfigOutput '42' config.listResult ./composed-types-valueMeta.nix diff --git a/lib/tests/modules/composed-types-valueMeta.nix b/lib/tests/modules/composed-types-valueMeta.nix index b95a0c8c6112..734917f8b67d 100644 --- a/lib/tests/modules/composed-types-valueMeta.nix +++ b/lib/tests/modules/composed-types-valueMeta.nix @@ -64,10 +64,10 @@ in ]; # Result options to expose the list module to bash as plain attribute path options.listResult = mkOption { - default = (builtins.head options.listOfModule.valueMeta.list).options.bar.value; + default = (builtins.head options.listOfModule.valueMeta.list).configuration.options.bar.value; }; options.mergedListResult = mkOption { - default = (builtins.head options.mergedListOfModule.valueMeta.list).options.bar.value; + default = (builtins.head options.mergedListOfModule.valueMeta.list).configuration.options.bar.value; }; } ) diff --git a/lib/types.nix b/lib/types.nix index 6b8386089eac..6b51f9254a00 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -1264,7 +1264,7 @@ let { headError = checkDefsForError check loc defs; value = configuration.config; - valueMeta = configuration; + valueMeta = { inherit configuration; }; }; }; emptyValue = {