From 6777a160c23ed28cd71376d6a39f85bab0521642 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= Date: Fri, 27 Jan 2023 13:11:12 +0100 Subject: [PATCH] Add gccarch settings for arm64 --- config/instance-20221213-1915.nix | 10 ++++++++++ config/nix.nix | 2 +- config/services/hydra.nix | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/config/instance-20221213-1915.nix b/config/instance-20221213-1915.nix index 212bb496..728e0761 100644 --- a/config/instance-20221213-1915.nix +++ b/config/instance-20221213-1915.nix @@ -85,6 +85,16 @@ }; nix.settings.cores = 2; nix.settings.max-jobs = 2; + nix.settings.system-features = [ + "nixos-test" + "big-parallel" + "benchmark" + "gccarch-armv8-a" + "gccarch-armv8.1-a" + "gccarch-armv8.2-a" + "gccarch-skylake" + "ca-derivations" + ]; nix.daemonCPUSchedPolicy = "idle"; nix.daemonIOSchedClass = "idle"; diff --git a/config/nix.nix b/config/nix.nix index 02a297ce..70f7bc41 100644 --- a/config/nix.nix +++ b/config/nix.nix @@ -94,7 +94,7 @@ in { ]; maxJobs = 2; speedFactor = 1; - supportedFeatures = ["nixos-test" "benchmark" "ca-derivations"]; + supportedFeatures = ["nixos-test" "benchmark" "ca-derivations" "gccarch-armv8-a" "gccarch-armv8.1-a" "gccarch-armv8.2-a"]; } ]; distributedBuilds = true; diff --git a/config/services/hydra.nix b/config/services/hydra.nix index 00f919c9..0d9707c9 100644 --- a/config/services/hydra.nix +++ b/config/services/hydra.nix @@ -9,7 +9,7 @@ clean-cache = nix-packages.packages.${system}.clean-s3-cache; machines = pkgs.writeText "machines" '' localhost armv7l-linux,powerpc-linux,powerpc64-linux,powerpc64le-linux,riscv32-linux,riscv64-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 - 2 1 nixos-test,benchmark,ca-derivations - + build-aarch64 aarch64-linux - 2 1 nixos-test,benchmark,ca-derivations,gccarch-armv8-a,gccarch-armv8.1-a,gccarch-armv8.2-a - ''; sshConfig = pkgs.writeText "ssh-config" '' Host build-aarch64 -- 2.47.0