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

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

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

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

@@ -164,18 +164,16 @@ let
};
};
allMachines = inventoryClass.machines;
allMachines = inventory.machines or { } // machines;
machineClasses = lib.mapAttrs (
name: _: inventory.machines.${name}.machineClass or "nixos"
) allMachines;
machineClass = lib.mapAttrs (name: _: inventory.machineClass.${name} or "nixos") allMachines;
configurations = lib.mapAttrs (
name: _: moduleSystemConstructor.${machineClasses.${name}} { inherit name; }
name: _: moduleSystemConstructor.${machineClass.${name}} { inherit name; }
) allMachines;
nixosConfigurations = lib.filterAttrs (name: _: machineClasses.${name} == "nixos") configurations;
darwinConfigurations = lib.filterAttrs (name: _: machineClasses.${name} == "darwin") configurations;
nixosConfigurations = lib.filterAttrs (name: _: machineClass.${name} == "nixos") configurations;
darwinConfigurations = lib.filterAttrs (name: _: machineClass.${name} == "darwin") configurations;
# This instantiates NixOS for each system that we support:
# configPerSystem = <system>.<machine>.nixosConfiguration
@@ -186,7 +184,7 @@ let
lib.nameValuePair system (
lib.mapAttrs (
name: _:
moduleSystemConstructor.${machineClasses.${name}} {
moduleSystemConstructor.${machineClass.${name}} {
inherit name system;
pkgs = pkgsFor.${system};
}
@@ -201,7 +199,7 @@ let
lib.nameValuePair system (
lib.mapAttrs (
name: _: args:
moduleSystemConstructor.${machineClasses.${name}} (
moduleSystemConstructor.${machineClass.${name}} (
args
// {
inherit name system;