From cec7fc48bb7e7a944fc00ba100018cc1237f6f83 Mon Sep 17 00:00:00 2001
From: Rick van Schijndel <rol3517@gmail.com>
Date: Fri, 6 May 2022 08:53:05 +0200
Subject: [PATCH] hydra-unstable: 2021-12-17 -> 2022-02-07

Co-authored-by: Linus Heckemann <git@sphalerite.org>
---
 pkgs/development/tools/misc/hydra/common.nix  | 16 ++++++++++++----
 pkgs/development/tools/misc/hydra/default.nix | 14 +++++++++-----
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/tools/misc/hydra/common.nix b/pkgs/development/tools/misc/hydra/common.nix
index c6bc9c60e3a..8cde9f460d9 100644
--- a/pkgs/development/tools/misc/hydra/common.nix
+++ b/pkgs/development/tools/misc/hydra/common.nix
@@ -9,6 +9,8 @@
 , foreman
 , python3
 , libressl
+, cacert
+, glibcLocales
 }:
 
 with stdenv;
@@ -22,19 +24,19 @@ let
     name = "hydra-perl-deps";
     paths = with perlPackages; lib.closePropagation
       [ ModulePluggable
+        AuthenSASL
         CatalystActionREST
         CatalystAuthenticationStoreDBIxClass
+        CatalystAuthenticationStoreLDAP
         CatalystDevel
-        CatalystDispatchTypeRegex
         CatalystPluginAccessLog
         CatalystPluginAuthorizationRoles
         CatalystPluginCaptcha
         CatalystPluginPrometheusTiny
         CatalystPluginSessionStateCookie
         CatalystPluginSessionStoreFastMmap
-        CatalystPluginSmartURI
         CatalystPluginStackTrace
-        CatalystRuntime
+        CatalystPluginUnicodeEncoding
         CatalystTraitForRequestProxyBase
         CatalystViewDownload
         CatalystViewJSON
@@ -52,8 +54,10 @@ let
         EmailMIME
         EmailSender
         FileSlurper
+        FileWhich
         IOCompress
         IPCRun
+        IPCRun3
         JSON
         JSONMaybeXS
         JSONXS
@@ -75,16 +79,18 @@ let
         StringCompareConstantTime
         SysHostnameLong
         TermSizeAny
+        TermReadKey
         Test2Harness
+        TestMore
         TestPostgreSQL
         TextDiff
         TextTable
+        UUID4Tiny
         XMLSimple
         YAML
         nix
         nix.perl-bindings
         git
-        boehmgc
       ];
   };
 in stdenv.mkDerivation rec {
@@ -110,7 +116,9 @@ in stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoreconfHook pkg-config mdbook autoconf automake ];
 
   checkInputs = [
+    cacert
     foreman
+    glibcLocales
     python3
     libressl.nc
   ];
diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix
index f0ae50a0dec..5289015d43b 100644
--- a/pkgs/development/tools/misc/hydra/default.nix
+++ b/pkgs/development/tools/misc/hydra/default.nix
@@ -1,19 +1,23 @@
-{ fetchFromGitHub, callPackage, nixVersions, nixosTests }:
+{ lib, fetchFromGitHub, callPackage, nixVersions, nixosTests, fetchpatch }:
 
 {
   hydra-unstable = callPackage ./common.nix {
-    version = "2021-12-17";
+    version = "2022-02-07";
     src = fetchFromGitHub {
       owner = "NixOS";
       repo = "hydra";
-      rev = "e1e5fafdff63c1e1595d2edb8c9854710211a0d7";
-      sha256 = "sha256-JPkw3heasqX9iWju7BWjKDsyoS+HmLIKM2ibwHq5+Ko=";
+      rev = "517dce285a851efd732affc084c7083aed2e98cd";
+      sha256 = "sha256-abWhd/VLNse3Gz7gcVbFANJLAhHV4nbOKjhVDmq/Zmg=";
     };
     patches = [
       ./eval.patch
       ./missing-std-string.patch
+      (fetchpatch {
+        url = "https://github.com/NixOS/hydra/commit/5ae26aa7604f714dcc73edcb74fe71ddc8957f6c.patch";
+        sha256 = "sha256-wkbWo8SFbT3qwVxwkKQWpQT5Jgb1Bb51yiLTlFdDN/I=";
+      })
     ];
-    nix = nixVersions.nix_2_4;
+    nix = nixVersions.nix_2_6;
 
     tests = {
       basic = nixosTests.hydra.hydra-unstable;