From fa87ba939f3dab851191d005fcb14430b7ac1ff0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= <lotte@chir.rs>
Date: Fri, 1 Jul 2022 19:36:28 +0100
Subject: [PATCH] revert 4608862acc4e022273d937a0daa0a287454f6253

---
 config/nix.nix            | 1 -
 config/nutty-noon.nix     | 1 -
 config/services/hydra.nix | 6 +-----
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/config/nix.nix b/config/nix.nix
index 4833f4cd..ad69d722 100644
--- a/config/nix.nix
+++ b/config/nix.nix
@@ -16,7 +16,6 @@
       require-sigs = true;
       builders-use-substitutes = true;
       substituters = [
-        "https://hydra.int.chir.rs/"
         "https://f000.backblazeb2.com/file/cache-chir-rs/"
       ];
       trusted-public-keys = [
diff --git a/config/nutty-noon.nix b/config/nutty-noon.nix
index 429ba59f..148a1fd7 100644
--- a/config/nutty-noon.nix
+++ b/config/nutty-noon.nix
@@ -159,7 +159,6 @@
     "wasm32-wasi"
   ];
   nix.settings.substituters = lib.mkForce [
-    "https://hydra.int.chir.rs/"
     "https://cache.nixos.org/"
   ];
   nix.buildMachines = lib.mkForce [
diff --git a/config/services/hydra.nix b/config/services/hydra.nix
index 04de911d..8a07ec09 100644
--- a/config/services/hydra.nix
+++ b/config/services/hydra.nix
@@ -43,17 +43,13 @@ in {
       <githubstatus>
         jobs = .*
       </githubstatus>
+      store_uri = s3://cache-chir-rs?scheme=https&endpoint=s3.us-west-000.backblazeb2.com&secret-key=${config.sops.secrets."services/hydra/cache-key".path}&multipart-upload=true&compression=zstd&compression-level=15
       <hydra_notify>
         <prometheus>
           listen_address = 127.0.0.1
           port = 9199
         </prometheus>
       </hydra_notify>
-      <runcommand>
-        job = *:*:*
-        command = nix copy --to 's3://cache-chir-rs?scheme=https&endpoint=s3.us-west-000.backblazeb2.com&secret-key=${config.sops.secrets."services/hydra/cache-key".path}&multipart-upload=true&compression=zstd&compression-level=15' $(cat $HYDRA_JSON | ${pkgs.jq}/bin/jq -r '.products[].path')
-      </runcommand>
-      binary_cache_secret_key_file = ${config.sops.secrets."services/hydra/cache-key".path}
     '';
     giteaTokenFile = "/run/secrets/services/hydra/gitea_token";
     githubTokenFile = "/run/secrets/services/hydra/github_token";