darkkirb/nixos-config
1
0
Fork 0
Code Issues 1 Pull requests 1 Projects Releases Packages Wiki Activity Actions

Merge pull request 'fix gccarch definitions' (#110) from fix-gccarch-definitions into main

Browse source 
Reviewed-on: #110
This commit is contained in:
Charlotte 🦝 Delenk 2023-06-19 12:44:59 +00:00
commit 553f149204
Signed by: gitea-bot
GPG key ID: C9974EDF9932B558
3 changed files with 23 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
config/nix.nix
View file

@ -115,7 +115,19 @@ in {
]; ];
maxJobs = 4; maxJobs = 4;
speedFactor = 1; speedFactor = 1;
supportedFeatures = ["nixos-test" "benchmark" "ca-derivations"]; supportedFeatures = [
"nixos-test"
"benchmark"
"gccarch-rv64gc_zba_zbb"
"gccarch-rv64gc_zba"
"gccarch-rv64gc_zbb"
"gccarch-rv64gc"
"gccarch-rv32gc_zba_zbb"
"gccarch-rv32gc_zba"
"gccarch-rv32gc_zbb"
"gccarch-rv32gc"
"ca-derivations"
];
} }
]) ])
]; ];

2
config/services/hydra.nix
View file

@ -9,7 +9,7 @@
machines = pkgs.writeText "machines" '' machines = pkgs.writeText "machines" ''
localhost armv7l-linux,powerpc-linux,powerpc64-linux,powerpc64le-linux,wasm32-wasi,x86_64-linux,i686-linux - 12 1 kvm,nixos-test,big-parallel,benchmark,gccarch-znver1,gccarch-skylake,ca-derivations - localhost armv7l-linux,powerpc-linux,powerpc64-linux,powerpc64le-linux,wasm32-wasi,x86_64-linux,i686-linux - 12 1 kvm,nixos-test,big-parallel,benchmark,gccarch-znver1,gccarch-skylake,ca-derivations -
build-aarch64 aarch64-linux - 4 1 nixos-test,benchmark,ca-derivations,gccarch-armv8-a,gccarch-armv8.1-a,gccarch-armv8.2-a,big-parallel - build-aarch64 aarch64-linux - 4 1 nixos-test,benchmark,ca-derivations,gccarch-armv8-a,gccarch-armv8.1-a,gccarch-armv8.2-a,big-parallel -
build-riscv riscv-linux - 4 1 nixos-test,benchmark,ca-derivations,big-parallel - build-riscv riscv-linux - 4 1 nixos-test,benchmark,ca-derivations,gccarch-rv64gc_zba_zbb,gccarch-rv64gc_zba,gccarch-rv64gc_zbb,ccarch-rv64gc,gccarch-rv32gc_zba_zbb,gccarch-rv32gc_zba,gccarch-rv32gc_zbb,ccarch-rv32gc,big-parallel -
''; '';
sshConfig = pkgs.writeText "ssh-config" '' sshConfig = pkgs.writeText "ssh-config" ''
Host build-aarch64 Host build-aarch64

15
config/vf2.nix
View file

@ -163,12 +163,15 @@
"big-parallel" "big-parallel"
"benchmark" "benchmark"
"ca-derivations" "ca-derivations"
"gccarch-riscv-i" # There are many more combinations but i simply do not care lol
"gccarch-riscv-m" "gccarch-rv64gc_zba_zbb"
"gccarch-riscv-a" "gccarch-rv64gc_zba"
"gccarch-riscv-f" "gccarch-rv64gc_zbb"
"gccarch-riscv-d" "gccarch-rv64gc"
"gccarch-riscv-c" "gccarch-rv32gc_zba_zbb"
"gccarch-rv32gc_zba"
"gccarch-rv32gc_zbb"
"gccarch-rv32gc"
]; ];
nix.daemonCPUSchedPolicy = "idle"; nix.daemonCPUSchedPolicy = "idle";
nix.daemonIOSchedClass = "idle"; nix.daemonIOSchedClass = "idle";