mikael/idiosyn
mikael/idiosyn
1
1
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

nixos/muon: Extend machine feature specification

Browse source
This commit is contained in:
Mikael Voss 2024-10-13 21:41:53 +02:00
parent f9381f1389
commit 9b1a223c71
No known key found for this signature in database
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
nixos/config/muon.nix
View file

@ -258,7 +258,12 @@ imports = [
{ from = 6001; to = 6011; } { from = 6001; to = 6011; }
]; ];
nix = { nix = let
base = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];
x86-64 = [ "gccarch-x86-64" "gccarch-x86-64-v2" "gccarch-x86-64-v3" ];
riscv = [ "gccarch-rv64imac" "gccarch-rv64imacfd" "gccarch-rv64gc" ];
aarch = [ "gccarch-armv8-a" ];
in {
distributedBuilds = true; distributedBuilds = true;
buildMachines = [ buildMachines = [
{ {
@ -268,7 +273,7 @@ imports = [
maxJobs = 2; maxJobs = 2;
speedFactor = 4; speedFactor = 4;
systems = [ "aarch64-linux" ]; systems = [ "aarch64-linux" ];
supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ]; supportedFeatures = base ++ aarch;
sshKey = "/etc/keys/nix-ssh"; sshKey = "/etc/keys/nix-ssh";
} }
] ++ (lib.range 1 8 |> map (num: { ] ++ (lib.range 1 8 |> map (num: {
@ -278,9 +283,11 @@ imports = [
maxJobs = 4; maxJobs = 4;
speedFactor = 16; speedFactor = 16;
systems = [ "x86_64-linux" "i686-linux" ]; systems = [ "x86_64-linux" "i686-linux" ];
supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" "gccarch-x86-64" "gccarch-x86-64-v2" "gccarch-x86-64-v3" ]; supportedFeatures = base ++ x86-64;
sshKey = "/etc/keys/nix-ssh"; sshKey = "/etc/keys/nix-ssh";
})); }));
settings.system-features = base ++ x86-64 ++ riscv ++ aarch;
}; };
programs.ssh = { programs.ssh = {