From 293f5bcf0417729d07bdfb58cb067c75afb94e03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= <lotte@chir.rs>
Date: Sat, 9 Dec 2023 11:02:48 +0100
Subject: [PATCH] update hydra

---
 flake.lock | 84 ++++++++++++++++++++++++++++--------------------------
 flake.nix  |  5 ++++
 2 files changed, 49 insertions(+), 40 deletions(-)

diff --git a/flake.lock b/flake.lock
index 22f9c841..70ad9ea9 100644
--- a/flake.lock
+++ b/flake.lock
@@ -226,6 +226,22 @@
         "type": "github"
       }
     },
+    "flake-compat_2": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1673956053,
+        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": [
@@ -315,24 +331,21 @@
       "inputs": {
         "nix": "nix",
         "nixpkgs": [
-          "nix-packages",
-          "hydra",
-          "nix",
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1697704332,
-        "narHash": "sha256-XDDllf7VLpSuQcBxv4v2BGoeKhbqDqISAu8r48eqc3Y=",
-        "ref": "refs/heads/master",
-        "rev": "30ba162924d53d4daafb09414b86241e7ecaa9ab",
-        "revCount": 4073,
-        "type": "git",
-        "url": "https://git.chir.rs/darkkirb/hydra"
+        "lastModified": 1701979646,
+        "narHash": "sha256-JBTFxGHyd2AJbMZznQFrNyHMawH6aKCz7zLiXEAN6mw=",
+        "owner": "DarkKirb",
+        "repo": "hydra",
+        "rev": "049f608ba24208e502d6b9488f65a4738d189407",
+        "type": "github"
       },
       "original": {
-        "type": "git",
-        "url": "https://git.chir.rs/darkkirb/hydra"
+        "owner": "DarkKirb",
+        "repo": "hydra",
+        "type": "github"
       }
     },
     "lib-aggregate": {
@@ -499,21 +512,25 @@
     },
     "nix": {
       "inputs": {
+        "flake-compat": "flake-compat_2",
         "lowdown-src": "lowdown-src",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": [
+          "hydra",
+          "nixpkgs"
+        ],
         "nixpkgs-regression": "nixpkgs-regression"
       },
       "locked": {
-        "lastModified": 1677045134,
-        "narHash": "sha256-jUc2ccTR8f6MGY2pUKgujm+lxSPNGm/ZAP+toX+nMNc=",
-        "owner": "nixos",
+        "lastModified": 1701122567,
+        "narHash": "sha256-iA8DqS+W2fWTfR+nNJSvMHqQ+4NpYMRT3b+2zS6JTvE=",
+        "owner": "NixOS",
         "repo": "nix",
-        "rev": "4acc684ef7b3117c6d6ac12837398a0008a53d85",
+        "rev": "50f8f1c8bc019a4c0fd098b9ac674b94cfc6af0d",
         "type": "github"
       },
       "original": {
-        "owner": "nixos",
-        "ref": "2.13.3",
+        "owner": "NixOS",
+        "ref": "2.19.2",
         "repo": "nix",
         "type": "github"
       }
@@ -570,7 +587,9 @@
           "flake-utils"
         ],
         "gomod2nix": "gomod2nix",
-        "hydra": "hydra",
+        "hydra": [
+          "hydra"
+        ],
         "mautrix-cleanup": "mautrix-cleanup",
         "nixpkgs": [
           "nixpkgs"
@@ -631,16 +650,15 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1670461440,
-        "narHash": "sha256-jy1LB8HOMKGJEGXgzFRLDU1CBGL0/LlkolgnqIsF0D8=",
+        "lastModified": 1701972474,
+        "narHash": "sha256-RFHuCDzAkcu6dY1I1hck8FOQyioSBPvGyU2RJyUs0ws=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "04a75b2eecc0acf6239acf9dd04485ff8d14f425",
+        "rev": "ab1da0d9bc106c17e2041f99393b8a8cda2b9b44",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-22.11-small",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -661,21 +679,6 @@
         "type": "github"
       }
     },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1701972474,
-        "narHash": "sha256-RFHuCDzAkcu6dY1I1hck8FOQyioSBPvGyU2RJyUs0ws=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "ab1da0d9bc106c17e2041f99393b8a8cda2b9b44",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nur": {
       "locked": {
         "lastModified": 1701971067,
@@ -705,6 +708,7 @@
         "flake-parts": "flake-parts",
         "flake-utils": "flake-utils",
         "home-manager": "home-manager",
+        "hydra": "hydra",
         "lib-aggregate": "lib-aggregate",
         "mozilla": "mozilla",
         "naersk": "naersk",
@@ -713,7 +717,7 @@
         "nix-packages": "nix-packages",
         "nixos-hardware": "nixos-hardware",
         "nixos-vscode-server": "nixos-vscode-server",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs",
         "nur": "nur",
         "sops-nix": "sops-nix",
         "systems": "systems"
diff --git a/flake.nix b/flake.nix
index 76b5a789..7ec98ddc 100644
--- a/flake.nix
+++ b/flake.nix
@@ -68,6 +68,10 @@ rec {
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    hydra = {
+      url = "github:DarkKirb/hydra";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
     lib-aggregate = {
       url = "github:nix-community/lib-aggregate";
       inputs.flake-utils.follows = "flake-utils";
@@ -92,6 +96,7 @@ rec {
       inputs.flake-compat.follows = "flake-compat";
       inputs.flake-utils.follows = "flake-utils";
       inputs.nixpkgs.follows = "nixpkgs";
+      inputs.hydra.follows = "hydra";
     };
     nixos-hardware.url = "github:NixOS/nixos-hardware";
     nixos-vscode-server = {