Skip to content

module: add speedFactor and sshProtocol #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

module: add speedFactor and sshProtocol #33

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e57a1ae
Add speedFactor option for builder configuration
khaneliman May 10, 2025
94d2ea2
Add configurable SSH protocol option
khaneliman May 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 24 additions & 1 deletion module.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,16 @@ in
'';
};

speedFactor = mkOption {
type = types.int;
default = 1;
description = ''
The relative speed factor of the builder.
This sets the speed factor in the `nix.buildMachines` specification,
which affects how Nix distributes build tasks to this machine.
'';
};

cores = mkOption {
type = types.int;
default = 8;
Expand Down Expand Up @@ -119,6 +129,18 @@ in
The SSH port used by the VM.
'';
};

sshProtocol = mkOption {
type = types.enum [
"ssh"
"ssh-ng"
];
default = "ssh-ng";
description = ''
The SSH protocol to use for remote builds.
Options are "ssh" (legacy) or "ssh-ng" (newer protocol with better performance).
'';
};
};

config =
Expand Down Expand Up @@ -376,9 +398,10 @@ in
nix = {
buildMachines = [
{
inherit (cfg) speedFactor;
hostName = sshHost;
maxJobs = cfg.cores;
protocol = "ssh-ng";
protocol = cfg.sshProtocol;
supportedFeatures = [
"benchmark"
"big-parallel"
Expand Down