clan: Remove pkgsForSystem

This commit is contained in:
Qubasa
2024-11-08 14:11:26 +07:00
committed by Luis Hebendanz
parent c1880a3624
commit 382e27a20b
2 changed files with 9 additions and 16 deletions

View File

@@ -3,6 +3,7 @@ let
types = lib.types;
in
{
options = {
# Required options
directory = lib.mkOption {
@@ -69,18 +70,6 @@ in
default = { };
};
pkgsForSystem = lib.mkOption {
type = types.functionTo (types.nullOr types.attrs);
default = _: null;
defaultText = "Lambda :: String -> { ... } | null";
description = ''
A function that maps from architecture to pkg. `( string -> pkgs )`
If specified this nixpkgs will be only imported once for each system.
This improves performance, but all nipxkgs.* options will be ignored.
'';
};
# Outputs
nixosConfigurations = lib.mkOption {
# Hide from documentation.
@@ -112,4 +101,5 @@ in
};
};
};
}

View File

@@ -9,7 +9,6 @@ let
inherit (config)
directory
machines
pkgsForSystem
specialArgs
;
@@ -58,7 +57,7 @@ let
# Settings
clan.core.clanDir = directory;
# Inherited from clan wide settings
# TODO: remove these
# TODO: remove these`
clan.core.name = config.inventory.meta.name;
clan.core.icon = config.inventory.meta.icon;
@@ -105,7 +104,11 @@ let
name: _:
nixosConfiguration {
inherit name system;
pkgs = pkgsForSystem system;
# We removed pkgsForSystems because we have the problem that nixpkgs.* options are then ignored
# However our current model is to have the hardware config read and then set nixpkgs.hostPlatform automatically
# which gets ignored if we set pkgsForSystems
pkgs = nixpkgs.legacyPackages.${system};
}
) allMachines
)
@@ -122,7 +125,7 @@ let
args
// {
inherit name system;
pkgs = pkgsForSystem system;
pkgs = nixpkgs.legacyPackages.${system};
}
)
) allMachines