mirrors/nix-darwin
mirrors/nix-darwin
1
0
Fork 0
mirror of https://github.com/LnL7/nix-darwin.git synced 2025-03-28 02:37:09 +00:00
Code Activity

Merge remote-tracking branch 'ethnt/linux-builder-systems-config' into linux-builder-big-config-take-2

Browse source
This commit is contained in:
Logan Barnett 2024-02-21 09:29:40 -08:00
commit 9f4fbed460
No known key found for this signature in database
GPG key ID: 41E46FB1ACEA3EF0
1 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
modules/nix/linux-builder.nix
View file

@ -71,8 +71,7 @@ in
{var}`supportedFeatures`.
This sets the corresponding `nix.buildMachines.*.mandatoryFeatures` option.
'';
};
'';
maxJobs = mkOption {
type = types.ints.positive;
@ -99,7 +98,8 @@ in
Use `null` when trying to change the special localhost builder without a
protocol which is for example used by hydra.
'';
'';
};
speedFactor = mkOption {
type = types.ints.positive;
@ -126,6 +126,23 @@ in
'';
};
systems = mkOption {
type = types.listOf types.str;
default = [ "${stdenv.hostPlatform.uname.processor}-linux" ];
example = literalExpression ''
[
"x86_64-linux"
"aarch64-linux"
]
'';
description = lib.mdDoc ''
This option specifies system types the build machine can execute derivations on.
This sets the corresponding `nix.buildMachines.*.systems` option.
'';
};
workingDirectory = mkOption {
type = types.str;
default = "/var/lib/darwin-builder";
@ -184,9 +201,8 @@ in
hostName = "linux-builder";
sshUser = "builder";
sshKey = "/etc/nix/builder_ed25519";
system = "${stdenv.hostPlatform.uname.processor}-linux";
publicHostKey = "c3NoLWVkMjU1MTkgQUFBQUMzTnphQzFsWkRJMU5URTVBQUFBSUpCV2N4Yi9CbGFxdDFhdU90RStGOFFVV3JVb3RpQzVxQkorVXVFV2RWQ2Igcm9vdEBuaXhvcwo=";
inherit (cfg) mandatoryFeatures maxJobs protocol speedFactor supportedFeatures;
inherit (cfg) mandatoryFeatures maxJobs protocol speedFactor supportedFeatures systems;
}];
nix.settings.builders-use-substitutes = true;