Revert "Merge pull request 'chore(buildClan): move machineClass option into inventory.machines submodule' (#3259) from hsjobeki/clan-core:buildclan-cleanup into main"

This reverts commit 11ba13df67, reversing
changes made to 04f9aa3ae0.
This commit is contained in:
Jörg Thalheim
2025-04-09 16:08:39 +02:00
parent b66317af04
commit 62dfb23e41
5 changed files with 29 additions and 34 deletions

View File

@@ -210,16 +210,14 @@ in
meta.name = "test";
machines.machine1 = { };
inventory.machines.machine2 = {
machineClass = "darwin";
};
inventory.machines.machine3 = {
machineClass = "nixos";
};
machines.machine2 = { };
machines.machine3 = { };
inventory.machineClass.machine2 = "darwin";
inventory.machineClass.machine3 = "nixos";
};
in
{
inherit result;
expr = {
nixos = builtins.attrNames result.nixosConfigurations;
darwin = builtins.attrNames result.darwinConfigurations;
@@ -243,6 +241,7 @@ in
meta.name = "test";
machines.machine1.non_existent_option = throw "eval error";
inventory.machines.machine1.other_non_existent_option = throw "different eval error";
};
in
{