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

Inventory: rename internal inventory toplevel attribute to 'inventoryClass'

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
checks/backups/flake-module.nix
View File

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

2
lib/build-clan/interface.nix
View File

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

6
lib/build-clan/module.nix
View File

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

1
lib/inventory/build-inventory/builder/default.nix
View File

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