Inventory: rename internal inventory toplevel attribute to 'inventoryClass'

This commit is contained in:
Johannes Kirschbauer
2025-03-07 21:24:06 +09:00
committed by clan-bot
parent ba0ed30997
commit a2b76eb5a2
4 changed files with 5 additions and 6 deletions

View File

@@ -188,7 +188,7 @@
]
++
# import the inventory generated nixosModules
self.clanInternals.serviceConfigs.machines.test-backup.machineImports;
self.clanInternals.inventoryClass.machines.test-backup.machineImports;
clan.core.settings.directory = ./.;
environment.systemPackages = [
(pkgs.writeShellScriptBin "foo" ''

View File

@@ -141,7 +141,7 @@ in
moduleSchemas = lib.mkOption { type = lib.types.raw; };
inventoryFile = lib.mkOption { type = lib.types.raw; };
# The machine 'imports' generated by the inventory per machine
serviceConfigs = lib.mkOption { type = lib.types.raw; };
inventoryClass = lib.mkOption { type = lib.types.raw; };
# clan-core's modules
clanModules = lib.mkOption { type = lib.types.raw; };
source = lib.mkOption { type = lib.types.raw; };

View File

@@ -42,7 +42,7 @@ let
# map from machine name to service configuration
# { ${machineName} :: Config }
serviceConfigs = (
inventoryClass = (
buildInventory {
inherit inventory directory;
}
@@ -76,7 +76,7 @@ let
(machines.${name} or { })
# Inherit the inventory assertions ?
# { inherit (mergedInventory) assertions; }
{ imports = serviceConfigs.machines.${name}.machineImports or [ ]; }
{ imports = inventoryClass.machines.${name}.machineImports or [ ]; }
(
{
# Settings
@@ -204,7 +204,7 @@ in
clanInternals = {
moduleSchemas = clan-core.lib.modules.getModulesSchema config.inventory.modules;
inherit serviceConfigs;
inherit inventoryClass;
inherit (clan-core) clanModules;
inherit inventoryFile;
inventoryValuesPrios =

View File

@@ -270,5 +270,4 @@ in
}
) (inventory.machines or { });
};
}