Merge pull request 'build-clan: drop unused machinesFunc' (#3324) from push-wktowzqkrvsp into main

Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/3324
This commit is contained in:
Michael Hoang
2025-04-15 12:20:09 +00:00
2 changed files with 0 additions and 20 deletions

View File

@@ -169,7 +169,6 @@ in
clanLib = lib.mkOption { type = lib.types.raw; };
all-machines-json = lib.mkOption { type = lib.types.raw; };
machines = lib.mkOption { type = lib.types.raw; };
machinesFunc = lib.mkOption { type = lib.types.raw; };
};
};
};

View File

@@ -141,24 +141,6 @@ let
) supportedSystems
);
configsFuncPerSystem = builtins.listToAttrs (
builtins.map (
system:
lib.nameValuePair system (
lib.mapAttrs (
name: _: args:
moduleSystemConstructor.${machineClasses.${name}} (
args
// {
inherit name system;
pkgs = pkgsFor.${system};
}
)
) allMachines
)
) supportedSystems
);
inventoryFile = "${directory}/inventory.json";
inventoryLoaded =
@@ -230,7 +212,6 @@ in
# machine specifics
machines = configsPerSystem;
machinesFunc = configsFuncPerSystem;
all-machines-json =
if !lib.hasAttrByPath [ "darwinModules" "clanCore" ] clan-core then
lib.mapAttrs (