From b68aede2efc3a411492b8fe78d95b3a43100cde8 Mon Sep 17 00:00:00 2001
From: Christoph Hollizeck <christoph.hollizeck@hey.com>
Date: Tue, 20 Jan 2026 23:58:17 +0100
Subject: [PATCH] hydra: use flake input

---
 flake.lock               | 89 ++++++++++++++++++++++++++++++++++++----
 flake.nix                |  2 +
 modules/server/hydra.nix |  3 +-
 3 files changed, 84 insertions(+), 10 deletions(-)

diff --git a/flake.lock b/flake.lock
index b134edd..706e777 100644
--- a/flake.lock
+++ b/flake.lock
@@ -643,6 +643,26 @@
         "type": "github"
       }
     },
+    "hydra-ci": {
+      "inputs": {
+        "nix": "nix_2",
+        "nix-eval-jobs": "nix-eval-jobs",
+        "nixpkgs": "nixpkgs_3"
+      },
+      "locked": {
+        "lastModified": 1768396302,
+        "narHash": "sha256-P83O7scGSQUQtkvS59oNgh6/VS3ef7AHupApuqTHKiQ=",
+        "owner": "NixOS",
+        "repo": "hydra",
+        "rev": "9df4b65c672f0b123235d3123e84679048cd5df3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "hydra",
+        "type": "github"
+      }
+    },
     "hyprcursor": {
       "inputs": {
         "hyprlang": [
@@ -1267,6 +1287,23 @@
         "type": "github"
       }
     },
+    "nix-eval-jobs": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1760478325,
+        "narHash": "sha256-hA+NOH8KDcsuvH7vJqSwk74PyZP3MtvI/l+CggZcnTc=",
+        "owner": "nix-community",
+        "repo": "nix-eval-jobs",
+        "rev": "daa42f9e9c84aeff1e325dd50fda321f53dfd02c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "ref": "v2.32.1",
+        "repo": "nix-eval-jobs",
+        "type": "github"
+      }
+    },
     "nix-gaming": {
       "inputs": {
         "flake-parts": "flake-parts_3",
@@ -1288,6 +1325,23 @@
         "type": "github"
       }
     },
+    "nix_2": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1768160359,
+        "narHash": "sha256-XDCQIrHNJKMYoL8hcUgzEbBHzINofkcsLRDr7tYa7Ac=",
+        "owner": "NixOS",
+        "repo": "nix",
+        "rev": "b601b44de51f8d46530a99659f889027e1e7d670",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "2.32-maintenance",
+        "repo": "nix",
+        "type": "github"
+      }
+    },
     "nixd": {
       "inputs": {
         "flake-parts": [
@@ -1584,6 +1638,22 @@
       }
     },
     "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1768129980,
+        "narHash": "sha256-QJ4xDnLGWTz6r844qXcfBYE14FX00PU7+BJthwJpiQQ=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "3bb0067937fe6c1adec9068b9ba24b1adc8defae",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-25.11-small",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_4": {
       "locked": {
         "lastModified": 1768564909,
         "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=",
@@ -1599,7 +1669,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_4": {
+    "nixpkgs_5": {
       "locked": {
         "lastModified": 1764374374,
         "narHash": "sha256-naS7hg/D1yLKSZoENx9gvsPLFiNEOTcqamJSu0OEvCA=",
@@ -1615,7 +1685,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_5": {
+    "nixpkgs_6": {
       "locked": {
         "lastModified": 1768569498,
         "narHash": "sha256-bB6Nt99Cj8Nu5nIUq0GLmpiErIT5KFshMQJGMZwgqUo=",
@@ -1631,7 +1701,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_6": {
+    "nixpkgs_7": {
       "locked": {
         "lastModified": 1767364772,
         "narHash": "sha256-fFUnEYMla8b7UKjijLnMe+oVFOz6HjijGGNS1l7dYaQ=",
@@ -1647,7 +1717,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_7": {
+    "nixpkgs_8": {
       "locked": {
         "lastModified": 1768127708,
         "narHash": "sha256-1Sm77VfZh3mU0F5OqKABNLWxOuDeHIlcFjsXeeiPazs=",
@@ -1720,6 +1790,7 @@
         "helix": "helix",
         "home-manager": "home-manager",
         "hy3": "hy3",
+        "hydra-ci": "hydra-ci",
         "hyprland": "hyprland",
         "hyprland-plugins": "hyprland-plugins",
         "hyprlock": "hyprlock",
@@ -1732,7 +1803,7 @@
         "nixos-images": "nixos-images",
         "nixos-raspberrypi": "nixos-raspberrypi",
         "nixos-wsl": "nixos-wsl",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs_4",
         "nixpkgs-latest-factorio": "nixpkgs-latest-factorio",
         "nixpkgs-latest-minecraft": "nixpkgs-latest-minecraft",
         "nixpkgs-master": "nixpkgs-master",
@@ -1773,7 +1844,7 @@
         "blobs": "blobs",
         "flake-compat": "flake-compat_6",
         "git-hooks": "git-hooks_3",
-        "nixpkgs": "nixpkgs_4"
+        "nixpkgs": "nixpkgs_5"
       },
       "locked": {
         "lastModified": 1766321686,
@@ -1791,7 +1862,7 @@
     },
     "sops-nix": {
       "inputs": {
-        "nixpkgs": "nixpkgs_5"
+        "nixpkgs": "nixpkgs_6"
       },
       "locked": {
         "lastModified": 1768863606,
@@ -1891,7 +1962,7 @@
     },
     "treefmt-nix_2": {
       "inputs": {
-        "nixpkgs": "nixpkgs_6"
+        "nixpkgs": "nixpkgs_7"
       },
       "locked": {
         "lastModified": 1768158989,
@@ -1984,7 +2055,7 @@
     "zen-browser": {
       "inputs": {
         "home-manager": "home-manager_2",
-        "nixpkgs": "nixpkgs_7"
+        "nixpkgs": "nixpkgs_8"
       },
       "locked": {
         "lastModified": 1768919538,
diff --git a/flake.nix b/flake.nix
index d4aebfa..7a6ad05 100644
--- a/flake.nix
+++ b/flake.nix
@@ -26,6 +26,8 @@
 
     nixos-hardware.url = "github:nixos/nixos-hardware";
 
+    hydra-ci.url = "github:NixOS/hydra";
+
     disko = {
       url = "github:nix-community/disko";
       inputs.nixpkgs.follows = "nixpkgs";
diff --git a/modules/server/hydra.nix b/modules/server/hydra.nix
index c0717a8..e66bc0a 100644
--- a/modules/server/hydra.nix
+++ b/modules/server/hydra.nix
@@ -2,6 +2,7 @@
   flake.modules.nixos.hydra =
     {
       config,
+      inputs,
       lib,
       pkgs,
       ...
@@ -30,7 +31,7 @@
 
       services.hydra = {
         enable = true;
-        package = pkgs.hydra.overrideAttrs { stdenv = pkgs.gcc14Stdenv; };
+        package = inputs.hydra-ci.packages.${pkgs.stdenv.system}.hydra;
 
         hydraURL = "http://localhost:${toString httpPort}";
         port = httpPort;