use lix hydra for real

config/services/hydra.nix

@@ -55,6 +55,9 @@ in {
     ../../modules/hydra.nix
     hydra.nixosModules.hydra
   ];
+  nixpkgs.overlays = [
+    hydra.overlays.default
+  ];
   services.hydra-dev = {
     enable = true;
     package = pkgs.hydra.overrideAttrs (super: {
@@ -65,12 +68,11 @@ in {
         or []
         ++ [
           ./hydra/0001-add-gitea-pulls.patch
-          ./hydra/0002-unrestrict-eval.patch
-          ./hydra/0003-unlimit-output.patch
-          ./hydra/0004-remove-pr-number-from-github-job-name.patch
-          ./hydra/0005-use-pulls-instead-of-issues.patch
-          ./hydra/0006-only-list-open-prs.patch
-          ./hydra/0007-status-state.patch
+          ./hydra/0002-unlimit-output.patch
+          ./hydra/0003-remove-pr-number-from-github-job-name.patch
+          ./hydra/0004-use-pulls-instead-of-issues.patch
+          ./hydra/0005-only-list-open-prs.patch
+          ./hydra/0006-status-state.patch
         ];
     });
     hydraURL = "https://hydra.chir.rs/";

config/services/hydra/0001-add-gitea-pulls.patch

@@ -1,7 +1,7 @@
-From 485657f5162cf063a8a6584255e9439b3f1686df Mon Sep 17 00:00:00 2001
+From c53f83b7d8ce1ea324980e60c588e1eb0ceae715 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= <lotte@chir.rs>
 Date: Wed, 4 Sep 2024 08:33:46 +0200
-Subject: [PATCH 1/8] add gitea pulls
+Subject: [PATCH 1/6] add gitea pulls
 
 ---
  src/lib/Hydra/Plugin/GiteaPulls.pm | 58 ++++++++++++++++++++++++++++++

config/services/hydra/0002-unlimit-output.patch

@@ -1,17 +1,17 @@
-From bb1a768327582fda0abd28b7272bb03bc8cbdeed Mon Sep 17 00:00:00 2001
+From b1e4e97a5fad51f2fad87b6743369f90b012aeb6 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= <lotte@chir.rs>
 Date: Wed, 4 Sep 2024 09:52:45 +0200
-Subject: [PATCH 3/8] unlimit output
+Subject: [PATCH 2/6] unlimit output
 
 ---
  src/hydra-queue-runner/build-remote.cc | 5 -----
  1 file changed, 5 deletions(-)
 
 diff --git a/src/hydra-queue-runner/build-remote.cc b/src/hydra-queue-runner/build-remote.cc
-index 1cabd291..ed737df9 100644
+index 352b2208..67513407 100644
 --- a/src/hydra-queue-runner/build-remote.cc
 +++ b/src/hydra-queue-runner/build-remote.cc
-@@ -566,11 +566,6 @@ void State::buildRemote(ref<Store> destStore,
+@@ -654,11 +654,6 @@ void State::buildRemote(ref<Store> destStore,
              size_t totalNarSize = 0;
              auto infos = build_remote::queryPathInfos(conn, *localStore, outputs, totalNarSize);
  

config/services/hydra/0002-unrestrict-eval.patch

@@ -1,27 +0,0 @@
-From 97e90672d88b5d9fd1d424d3360a36d3763efcc3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= <lotte@chir.rs>
-Date: Sat, 23 Dec 2023 10:43:51 +0100
-Subject: [PATCH 2/8] unrestrict eval
-
----
- src/hydra-eval-jobs/hydra-eval-jobs.cc | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/src/hydra-eval-jobs/hydra-eval-jobs.cc b/src/hydra-eval-jobs/hydra-eval-jobs.cc
-index 5adea42b..1b71dddd 100644
---- a/src/hydra-eval-jobs/hydra-eval-jobs.cc
-+++ b/src/hydra-eval-jobs/hydra-eval-jobs.cc
-@@ -321,10 +321,6 @@ int main(int argc, char * * argv)
-         /* FIXME: The build hook in conjunction with import-from-derivation is causing "unexpected EOF" during eval */
-         settings.builders = "";
- 
--        /* Prevent access to paths outside of the Nix search path and
--           to the environment. */
--        evalSettings.restrictEval = true;
--
-         /* When building a flake, use pure evaluation (no access to
-            'getEnv', 'currentSystem' etc. */
-         evalSettings.pureEval = pureEval;
--- 
-2.46.0
-

config/services/hydra/0003-remove-pr-number-from-github-job-name.patch

@@ -1,7 +1,7 @@
-From b9622a0dcd4de4e44df4fa8dded0b8c25226c7a5 Mon Sep 17 00:00:00 2001
+From fbdb6e02774208097164a5d1951bd6cf38d60392 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= <lotte@chir.rs>
 Date: Wed, 4 Sep 2024 09:54:13 +0200
-Subject: [PATCH 4/8] remove pr number from github job name
+Subject: [PATCH 3/6] remove pr number from github job name
 
 ---
  src/lib/Hydra/Plugin/GithubStatus.pm | 26 +++++++++++---------------

config/services/hydra/0004-use-pulls-instead-of-issues.patch

@@ -1,7 +1,7 @@
-From dfb85165f6f4c312a7521564100c6a4166645f32 Mon Sep 17 00:00:00 2001
+From 72fd2c2cfeef8f48136f9decd876068995ef3ce3 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= <lotte@chir.rs>
 Date: Wed, 4 Sep 2024 10:19:35 +0200
-Subject: [PATCH 5/8] use pulls instead of issues
+Subject: [PATCH 4/6] use pulls instead of issues
 
 ---
  src/lib/Hydra/Plugin/GiteaPulls.pm | 2 +-

config/services/hydra/0005-only-list-open-prs.patch

@@ -1,7 +1,7 @@
-From 2ddff52ddaae5cf301112581589ddc6df968d2f9 Mon Sep 17 00:00:00 2001
+From c34ae5b32e5973648f484e09a5f4b590467f88be Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= <lotte@chir.rs>
 Date: Wed, 4 Sep 2024 10:20:22 +0200
-Subject: [PATCH 6/8] only list open prs
+Subject: [PATCH 5/6] only list open prs
 
 ---
  src/lib/Hydra/Plugin/GiteaPulls.pm | 2 +-

config/services/hydra/0006-status-state.patch

@@ -1,7 +1,7 @@
-From 7f2197d5dbe5a576dc5e0478eac08a7bea84f018 Mon Sep 17 00:00:00 2001
+From 51d54758a00aebb4163a33dd75bb246007d561d1 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= <lotte@chir.rs>
 Date: Wed, 4 Sep 2024 10:21:14 +0200
-Subject: [PATCH 7/8] =?UTF-8?q?status=20=E2=86=92=20state?=
+Subject: [PATCH 6/6] =?UTF-8?q?status=20=E2=86=92=20state?=
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit