fix(clanLib): propagate clanLib into module apply

This commit is contained in:
Johannes Kirschbauer
2025-05-21 19:00:46 +02:00
parent f16cfe68b6
commit c4980d3990
10 changed files with 36 additions and 15 deletions

View File

@@ -403,7 +403,7 @@ in
};
settings = lib.mkOption {
default = { };
type = types.uniqueDeferredSerializableModule;
type = clanLib.types.uniqueDeferredSerializableModule;
};
};
}

View File

@@ -5,7 +5,7 @@ in
{
inherit (services) evalClanService mapInstances resolveModule;
inherit (import ./build-inventory { inherit lib clanLib; }) buildInventory;
interface = ./build-inventory/interface.nix;
interface = lib.modules.importApply ./build-inventory/interface.nix { inherit clanLib; };
# Returns the list of machine names
# { ... } -> [ string ]
resolveTags =

View File

@@ -17,7 +17,9 @@ let
frontMatterSchema = jsonLib.parseOptions self.clanLib.modules.frontmatterOptions { };
inventorySchema = jsonLib.parseModule (import ../build-inventory/interface.nix);
inventorySchema = jsonLib.parseModule (
import ../build-inventory/interface.nix { inherit (self) clanLib; }
);
renderSchema = pkgs.writers.writePython3Bin "render-schema" {
flakeIgnore = [