Centralize the config for buildMachines.

This commit is contained in:
Tom Alexander
2025-05-04 16:20:00 -04:00
parent 4a303d17d8
commit 98f98a8895
4 changed files with 122 additions and 61 deletions

View File

@@ -9,48 +9,19 @@
config = lib.mkMerge [
{
nix.distributedBuilds = true;
nix.buildMachines = [
{
hostName = "hydra";
sshUser = "nixworker";
systems = [
"x86_64-linux"
# "aarch64-linux"
];
maxJobs = 1;
me.distributed_build.enable = true;
me.distributed_build.machines.hydra = {
enable = true;
additional_config = {
speedFactor = 2;
supportedFeatures = [
# "nixos-test"
"benchmark"
"big-parallel"
# "kvm"
"gccarch-x86-64-v3"
"gccarch-x86-64-v4"
"gccarch-znver4"
];
}
{
hostName = "quark";
sshUser = "nixworker";
systems = [
"x86_64-linux"
# "aarch64-linux"
];
maxJobs = 1;
};
};
me.distributed_build.machines.quark = {
enable = true;
additional_config = {
speedFactor = 2;
supportedFeatures = [
# "nixos-test"
"benchmark"
"big-parallel"
# "kvm"
"gccarch-x86-64-v3"
"gccarch-x86-64-v4"
"gccarch-znver4"
"gccarch-znver5"
];
}
];
};
};
}
];
}

View File

@@ -9,28 +9,13 @@
config = lib.mkMerge [
{
nix.distributedBuilds = true;
nix.buildMachines = [
{
hostName = "hydra";
sshUser = "nixworker";
systems = [
"x86_64-linux"
# "aarch64-linux"
];
maxJobs = 1;
me.distributed_build.enable = true;
me.distributed_build.machines.hydra = {
enable = true;
additional_config = {
speedFactor = 2;
supportedFeatures = [
# "nixos-test"
"benchmark"
"big-parallel"
# "kvm"
"gccarch-x86-64-v3"
"gccarch-x86-64-v4"
"gccarch-znver4"
];
}
];
};
};
}
];
}