From d546dc37124e07d25a1d825776eef8546f9541d1 Mon Sep 17 00:00:00 2001
From: emily <ek@kyouma.net>
Date: Fri, 18 Oct 2024 16:17:20 +0200
Subject: [PATCH] hydra: fix build

---
 config/services/hydra/default.nix |  2 +-
 flake.lock                        | 18 ++++++++++--------
 flake.nix                         |  2 +-
 pkgs/build-worker-oci/default.nix |  4 ++--
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/config/services/hydra/default.nix b/config/services/hydra/default.nix
index 5073636..404be76 100644
--- a/config/services/hydra/default.nix
+++ b/config/services/hydra/default.nix
@@ -32,7 +32,7 @@
       binary_cache_public_uri = https://cache.kyouma.net
       evaluator_workers = 8
       evaluator_max_memory_size = 16384
-      max_output_size = 4294967296
+      max_output_size = ${builtins.toString (24 * 1024 * 1024 * 1024)}
     '';
   };
   services.harmonia = {
diff --git a/flake.lock b/flake.lock
index eb0e562..86ea9a9 100644
--- a/flake.lock
+++ b/flake.lock
@@ -543,15 +543,17 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1728321752,
-        "narHash": "sha256-GbBAoBF7ZObz0IP+g0LZKxMafpMvNKjTEu9haiZbV54=",
-        "ref": "refs/heads/main",
-        "rev": "ee1234c15cdcb427dbd4828e0add09d02cd606c9",
-        "revCount": 4220,
+        "lastModified": 1728215710,
+        "narHash": "sha256-TRxR6zELQoUDPhLkmBU8QjgskNyVcblKgQIxhuOyNRc=",
+        "ref": "main",
+        "rev": "799441dcf6d595efb0def686ca0815aef398627b",
+        "revCount": 4217,
         "type": "git",
         "url": "https://git.lix.systems/lix-project/hydra"
       },
       "original": {
+        "ref": "main",
+        "rev": "799441dcf6d595efb0def686ca0815aef398627b",
         "type": "git",
         "url": "https://git.lix.systems/lix-project/hydra"
       }
@@ -842,11 +844,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1728193676,
-        "narHash": "sha256-PbDWAIjKJdlVg+qQRhzdSor04bAPApDqIv2DofTyynk=",
+        "lastModified": 1725001927,
+        "narHash": "sha256-eV+63gK0Mp7ygCR0Oy4yIYSNcum2VQwnZamHxYTNi+M=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ecbc1ca8ffd6aea8372ad16be9ebbb39889e55b6",
+        "rev": "6e99f2a27d600612004fbd2c3282d614bfee6421",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 9a54db8..54cc1fa 100644
--- a/flake.nix
+++ b/flake.nix
@@ -26,7 +26,7 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     hydra = {
-      url = "git+https://git.lix.systems/lix-project/hydra";
+      url = "git+https://git.lix.systems/lix-project/hydra?ref=main&rev=799441dcf6d595efb0def686ca0815aef398627b";
       inputs.lix.follows = "lix";
     };
     iceshrimp = {
diff --git a/pkgs/build-worker-oci/default.nix b/pkgs/build-worker-oci/default.nix
index e458d57..4701811 100644
--- a/pkgs/build-worker-oci/default.nix
+++ b/pkgs/build-worker-oci/default.nix
@@ -34,8 +34,8 @@ dockerTools.buildLayeredImage {
     trusted-public-keys = cache.kyouma.net:Frjwu4q1rnwE/MnSTmX9yx86GNA/z3p/oElGvucLiZg= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
     max-substitution-jobs = 20
     max-silent-time = 14400
-    min-free = 17179869184
-    max-free = 34359738368
+    min-free = ${builtins.toString (49152 * 1024 * 1024)}
+    max-free = ${builtins.toString (65536 * 1024 * 1024)}
     system-features = benchmark big-parallel kvm nixos-test uid-range gccarch-x86-64 gccarch-x86-64-v2 gccarch-x86-64-v3
     EOF