modules/nixos/hydra: switch to fork

nix-community · Aug 7, 2024 · 8a6ec08 · 8a6ec08
1 parent 4aedab3
commit 8a6ec08
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 1 deletion.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -24,6 +24,8 @@
     flake-compat.url = "github:nix-community/flake-compat";
     flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs";
     flake-parts.url = "github:hercules-ci/flake-parts";
+    hydra.flake = false;
+    hydra.url = "github:qowoz/hydra/community";
     nix-darwin.inputs.nixpkgs.follows = "nixpkgs";
     nix-darwin.url = "github:LnL7/nix-darwin";
     nixpkgs-update-github-releases.flake = false;

diff --git a/modules/nixos/hydra.nix b/modules/nixos/hydra.nix
@@ -1,4 +1,9 @@
-{ pkgs, config, ... }:
+{
+  inputs,
+  pkgs,
+  config,
+  ...
+}:
 {
   config = {
     sops.secrets.hydra-admin-password.owner = "hydra";
@@ -25,6 +30,13 @@
 
     services.hydra = {
       enable = true;
+
+      package = (pkgs.hydra_unstable.override { nix = pkgs.nixVersions.nix_2_22; }).overrideAttrs (o: {
+        version = "${pkgs.lib.substring 0 8 inputs.hydra.rev}";
+        src = inputs.hydra;
+        buildInputs = o.buildInputs ++ [ pkgs.perlPackages.DBIxClassHelpers ];
+      });
+
       # remote builders set in /etc/nix/machines + localhost
       buildMachinesFiles = [
         (pkgs.runCommand "etc-nix-machines" { machines = config.environment.etc."nix/machines".text; } ''