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

inventory: don't loose string context of directory

Browse Source
This commit is contained in:
Jörg Thalheim
2025-04-08 12:18:09 +02:00
parent 6dc0f6b91d
commit f008da9472
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
checks/lib/test-inventory.nix
View File

@@ -32,7 +32,7 @@ in
nodes = flip mapAttrs serviceConfigs.machines ( nodes = flip mapAttrs serviceConfigs.machines (
machineName: attrs: { machineName: attrs: {
imports = attrs.machineImports ++ [ self.nixosModules.clanCore ]; imports = attrs.machineImports ++ [ self.nixosModules.clanCore ];
clan.core.settings.directory = toString config.inventory.directory; clan.core.settings.directory = "${config.inventory.directory}";
clan.core.settings.machine.name = machineName; clan.core.settings.machine.name = machineName;
} }
); );

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

@@ -27,7 +27,7 @@ in
else if v == null then else if v == null then
throw "Please set either clan.self or clan.directory" throw "Please set either clan.self or clan.directory"
else else
builtins.toString v "${v}"
) lib.types.path; ) lib.types.path;
default = builtins.toString self; default = builtins.toString self;
defaultText = "Root directory of the flake"; defaultText = "Root directory of the flake";