yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

feat(inventory/instances): preserve settings modifiers close at source

Browse Source
This commit is contained in:
Johannes Kirschbauer
2025-03-29 15:39:02 +01:00
parent a746b10578
commit fa6c3be21e
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/distributed-service/service-module.nix
View File

@@ -204,9 +204,8 @@ in
elemType = submoduleWith { elemType = submoduleWith {
modules = [ modules = [
(m: { (m: {
# TODO: Move the deferred module type into inventory interface ?
options.settings = mkOption { options.settings = mkOption {
type = types.deferredModule; type = types.raw;
description = "Settings of '${name}-machine': ${m.name}."; description = "Settings of '${name}-machine': ${m.name}.";
default = { }; default = { };
}; };
@@ -221,7 +220,7 @@ in
# options._settingsViaTags = mkOption { }; # options._settingsViaTags = mkOption { };
# A deferred module that combines _settingsViaTags with _settings # A deferred module that combines _settingsViaTags with _settings
options.settings = mkOption { options.settings = mkOption {
type = types.deferredModule; type = types.raw;
description = "Settings of 'role': ${name}"; description = "Settings of 'role': ${name}";
default = { }; default = { };
}; };

6
lib/inventory/build-inventory/interface.nix
View File

@@ -314,7 +314,7 @@ in
default = { }; default = { };
# Dont transform the value with `types.deferredModule` here. We need to keep it json serializable # Dont transform the value with `types.deferredModule` here. We need to keep it json serializable
# TODO: We need a custom serializer for deferredModule # TODO: We need a custom serializer for deferredModule
type = types.attrsOf types.raw; type = types.deferredModule;
}; };
} }
); );
@@ -325,7 +325,7 @@ in
types.submodule { types.submodule {
options.settings = lib.mkOption { options.settings = lib.mkOption {
default = { }; default = { };
type = types.attrsOf types.raw; type = types.deferredModule;
}; };
} }
); );
@@ -333,7 +333,7 @@ in
}; };
settings = lib.mkOption { settings = lib.mkOption {
default = { }; default = { };
type = types.attrsOf types.raw; type = types.deferredModule;
}; };
}; };
} }