From ac0477e710c41c4f3a9532b4d3dde0a30791d3b0 Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Tue, 3 Jun 2025 18:57:34 +0200 Subject: [PATCH] Fix(inventory/extraModules): use more narrow type for better persistence --- lib/inventory/build-inventory/interface.nix | 3 ++- pkgs/clan-cli/clan_lib/nix_models/clan.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/inventory/build-inventory/interface.nix b/lib/inventory/build-inventory/interface.nix index f65ea230d..d693df3df 100644 --- a/lib/inventory/build-inventory/interface.nix +++ b/lib/inventory/build-inventory/interface.nix @@ -448,7 +448,8 @@ in type = types.listOf ( types.oneOf [ types.str - types.anything + types.path + (types.attrsOf types.anything) ] ); }; diff --git a/pkgs/clan-cli/clan_lib/nix_models/clan.py b/pkgs/clan-cli/clan_lib/nix_models/clan.py index 7fd62ae06..ab0cde71f 100644 --- a/pkgs/clan-cli/clan_lib/nix_models/clan.py +++ b/pkgs/clan-cli/clan_lib/nix_models/clan.py @@ -38,7 +38,7 @@ class InventoryInstanceRoleTag(TypedDict): -InventoryInstanceRoleExtramodulesType = list[dict[str, Any] | list[Any] | bool | float | int | str | None] +InventoryInstanceRoleExtramodulesType = list[dict[str, Any] | str] InventoryInstanceRoleMachinesType = dict[str, InventoryInstanceRoleMachine] InventoryInstanceRoleSettingsType = Unknown InventoryInstanceRoleTagsType = dict[str, InventoryInstanceRoleTag]