Update from update-inputs-2024-11-25-04-20

config/services/hydra/default.nix

@@ -30,8 +30,8 @@
     extraConfig = ''
       server_store_uri = https://cache.kyouma.net
       binary_cache_public_uri = https://cache.kyouma.net
-      evaluator_workers = 6
+      evaluator_workers = 1
-      evaluator_max_memory_size = 12288
+      evaluator_max_memory_size = 4096
       max_output_size = ${builtins.toString (24 * 1024 * 1024 * 1024)}
     '';
   };
@@ -44,8 +44,8 @@
   };
 
   systemd.services.hydra-evaluator.serviceConfig = {
-    MemoryHigh = "250G";
+    MemoryHigh = "150G";
-    MemoryMax = "254G";
+    MemoryMax = "155G";
   };
 
   kyouma.nginx.defaultForbidden = "hydra.kyouma.net";

config/services/hydra/nix-config.nix

@@ -28,7 +28,7 @@
       supportedFeatures = base ++ [ "gccarch-rv64imac" "gccarch-rv64imacfd" "gccarch-rv64gc" ];
       sshKey = config.sops.secrets."services/hydra/id_ed25519_hydra".path;
     }
-  ] ++ lib.forEach (lib.range 0 10) (num: {
+  ] ++ lib.forEach (lib.range 0 11) (num: {
       hostName = "build-worker-${lib.fixedWidthNumber 2 num}";
       sshUser = "root";
       maxJobs = 2;
@@ -67,12 +67,13 @@
       "[build-worker-kyoumanet.fly.dev]:2208".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAk+FNMhTfAVqk3MfLp4QiG/i5ti53DlpnC0q+sOvU9O";
       "[build-worker-kyoumanet-cdg.fly.dev]:2209".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJGlQD/3fLn/Kyb7v0RIycHRcArGi75jURj803EMpW0S";
       "[build-worker-kyoumanet-cdg.fly.dev]:2210".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMQm1FSGBGdCR5f8MvBvdKM0M4yIQVnH1po7hHO5T1qz";
+      "[build-worker-kyoumanet-cdg.fly.dev]:2211".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINlH+v2ZlcDQY3itw4b7aRbwRTqDsTE0R5Ua3vF0VaGr";
     }; 
     extraConfig = ''
       Host machine-0008.cloud-v.co
         Hostname machine.cloud-v.co
         Port 20008
-    '' + lib.concatLines (lib.forEach (lib.range 0 10) (num: ''
+    '' + lib.concatLines (lib.forEach (lib.range 0 11) (num: ''
       Host build-worker-${lib.fixedWidthNumber 2 num}
         Hostname build-worker-kyoumanet${lib.optionalString (num > 8) "-cdg"}.fly.dev
         Port 22${lib.fixedWidthNumber 2 num}

flake.lock

@@ -156,11 +156,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1732284644,
+        "lastModified": 1732482708,
-        "narHash": "sha256-REGLarOB5McRMmFtOgNihEXXQILY6+2UBAY8lw8CJCI=",
+        "narHash": "sha256-B1MQLiWi4bbeNiRXKxEkpztnKyWae4x0LyK32v3DjLk=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "abc8baff333ac9dca930fc4921a26a8fc248e442",
+        "rev": "47bc8dfb6f48d5f66a3cb3a4cece83d8ace1f61a",
         "type": "github"
       },
       "original": {
@@ -222,10 +222,10 @@
         ]
       },
       "locked": {
-        "lastModified": 1732450026,
+        "lastModified": 1732481910,
-        "narHash": "sha256-byAlZM+BkUwKeOpF5/qbefZJqVxbSMcOShPjFfTDSr4=",
+        "narHash": "sha256-XXBdhGvx22lVDgIzzIHowBMGK7Z1jmmcZ6N22+ufu4A=",
         "ref": "refs/heads/main",
-        "rev": "60bb38f9dec635b1fb0429d53c5a5acb8591491f",
+        "rev": "22fff6832b2828006061d5c8f781ca052f55bdb2",
         "revCount": 4,
         "type": "git",
         "url": "https://woof.rip/mikael/firefox.git"
@@ -636,11 +636,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1732453510,
+        "lastModified": 1732482255,
-        "narHash": "sha256-mAOaLu++YRwOxCJ135Bhgf78WYhIKWHL2aGWCAoXoBg=",
+        "narHash": "sha256-GUffLwzawz5WRVfWaWCg78n/HrBJrOG7QadFY6rtV8A=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "bd58a1132e9b7f121f65313bc662ad6c8a05f878",
+        "rev": "a9953635d7f34e7358d5189751110f87e3ac17da",
         "type": "github"
       },
       "original": {
@@ -830,10 +830,10 @@
         ]
       },
       "locked": {
-        "lastModified": 1732450019,
+        "lastModified": 1732481879,
-        "narHash": "sha256-ooNVW3vB/YDwEJEsGJORIVhu5/cvdOgjZiNW1anhvYg=",
+        "narHash": "sha256-Tj9yPVOA2JlAAFhynX9MRkwOd8VYeilkoesn8zzQr2E=",
         "ref": "refs/heads/main",
-        "rev": "7fc0875871f7af9f732ceae29930d3b9d41e8ca3",
+        "rev": "b7171c109da4f52bf59ad5159ec13ee9246ec28d",
         "revCount": 1,
         "type": "git",
         "url": "https://woof.rip/mikael/neoidiosyn.git"
@@ -953,11 +953,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1731797098,
+        "lastModified": 1732483221,
-        "narHash": "sha256-UhWmEZhwJZmVZ1jfHZFzCg+ZLO9Tb/v3Y6LC0UNyeTo=",
+        "narHash": "sha256-kF6rDeCshoCgmQz+7uiuPdREVFuzhIorGOoPXMalL2U=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "672ac2ac86f7dff2f6f3406405bddecf960e0db6",
+        "rev": "45348ad6fb8ac0e8415f6e5e96efe47dd7f39405",
         "type": "github"
       },
       "original": {
@@ -1099,11 +1099,11 @@
         "treefmt-nix": "treefmt-nix_2"
       },
       "locked": {
-        "lastModified": 1732365274,
+        "lastModified": 1732478249,
-        "narHash": "sha256-78n1Z3+i686w1FHCWEiEimxvwJF/sgtG7Px0RyI9bLE=",
+        "narHash": "sha256-ka41KXN5B5C6yxJeIpFw5ytXFjd6vXJldw/5sN6y0CA=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "85759f2360faa0464da008b040217183d99fd9d9",
+        "rev": "a81a03a3f5dcdcdee5cbe831a9f2e81895e92875",
         "type": "github"
       },
       "original": {

pkgs/update-nixfiles/update-nixfiles.sh

@@ -23,6 +23,8 @@ merge_theirs () {
 test_build () {
   local build_jobs
 
+  sleep 30
+
   build_jobs="$(curl --fail -s -L -H "Accept: application/json" "${JOBSET_URL}/evals" | jq -r ".evals | max_by(.id) | .builds | .[]")"
   for build in ${build_jobs}; do 
     local build_status