build-clan: drop unused machinesFunc
This commit is contained in:
@@ -169,7 +169,6 @@ in
|
|||||||
clanLib = lib.mkOption { type = lib.types.raw; };
|
clanLib = lib.mkOption { type = lib.types.raw; };
|
||||||
all-machines-json = lib.mkOption { type = lib.types.raw; };
|
all-machines-json = lib.mkOption { type = lib.types.raw; };
|
||||||
machines = lib.mkOption { type = lib.types.raw; };
|
machines = lib.mkOption { type = lib.types.raw; };
|
||||||
machinesFunc = lib.mkOption { type = lib.types.raw; };
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -141,24 +141,6 @@ let
|
|||||||
) supportedSystems
|
) 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";
|
inventoryFile = "${directory}/inventory.json";
|
||||||
|
|
||||||
inventoryLoaded =
|
inventoryLoaded =
|
||||||
@@ -230,7 +212,6 @@ in
|
|||||||
|
|
||||||
# machine specifics
|
# machine specifics
|
||||||
machines = configsPerSystem;
|
machines = configsPerSystem;
|
||||||
machinesFunc = configsFuncPerSystem;
|
|
||||||
all-machines-json =
|
all-machines-json =
|
||||||
if !lib.hasAttrByPath [ "darwinModules" "clanCore" ] clan-core then
|
if !lib.hasAttrByPath [ "darwinModules" "clanCore" ] clan-core then
|
||||||
lib.mapAttrs (
|
lib.mapAttrs (
|
||||||
|
|||||||
Reference in New Issue
Block a user