From b832408a5f1fc818e794c83da84103e435a6ae17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= <lotte@chir.rs>
Date: Sun, 18 Jun 2023 15:47:12 +0100
Subject: [PATCH] fix gccarch definitions

---
 config/nas.nix            | 10 ++++++++++
 config/nix.nix            | 14 +++++++++++++-
 config/services/hydra.nix |  2 +-
 config/vf2.nix            | 15 +++++++++------
 4 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/config/nas.nix b/config/nas.nix
index d13272bb..4793461b 100644
--- a/config/nas.nix
+++ b/config/nas.nix
@@ -180,6 +180,16 @@
     "/ip6/::/tcp/5001"
   ]; # Only exposed over the tailed scale
 
+  nix.settings.system-features = [
+    "kvm"
+    "nixos-test"
+    "big-parallel"
+    "benchmark"
+    "gccarch-znver1"
+    "gccarch-skylake"
+    "ca-derivations"
+  ];
+
   # Remove when https://nixpk.gs/pr-tracker.html?pr=235815 hits
   nixpkgs.overlays = [
     (self: super: {
diff --git a/config/nix.nix b/config/nix.nix
index 4c2820c3..681435b1 100644
--- a/config/nix.nix
+++ b/config/nix.nix
@@ -115,7 +115,19 @@ in {
             ];
             maxJobs = 4;
             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"
+            ];
           }
         ])
       ];
diff --git a/config/services/hydra.nix b/config/services/hydra.nix
index d424c957..005920b2 100644
--- a/config/services/hydra.nix
+++ b/config/services/hydra.nix
@@ -9,7 +9,7 @@
   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  -
     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" ''
     Host build-aarch64
diff --git a/config/vf2.nix b/config/vf2.nix
index 36ed53c4..2a233d4f 100644
--- a/config/vf2.nix
+++ b/config/vf2.nix
@@ -163,12 +163,15 @@
     "big-parallel"
     "benchmark"
     "ca-derivations"
-    "gccarch-riscv-i"
-    "gccarch-riscv-m"
-    "gccarch-riscv-a"
-    "gccarch-riscv-f"
-    "gccarch-riscv-d"
-    "gccarch-riscv-c"
+    # There are many more combinations but i simply do not care lol
+    "gccarch-rv64gc_zba_zbb"
+    "gccarch-rv64gc_zba"
+    "gccarch-rv64gc_zbb"
+    "gccarch-rv64gc"
+    "gccarch-rv32gc_zba_zbb"
+    "gccarch-rv32gc_zba"
+    "gccarch-rv32gc_zbb"
+    "gccarch-rv32gc"
   ];
   nix.daemonCPUSchedPolicy = "idle";
   nix.daemonIOSchedClass = "idle";