modules/nixos/hydra: switch to upstream

nix-community · Jul 26, 2024 · 27a6100 · 27a6100
1 parent f822d3f
commit 27a6100
Show file tree

Hide file tree

Showing 3 changed files with 104 additions and 1 deletion.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -24,6 +24,14 @@
     flake-compat.url = "github:nix-community/flake-compat";
     flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs";
     flake-parts.url = "github:hercules-ci/flake-parts";
+    hydra-nix.inputs.flake-compat.follows = "flake-compat";
+    hydra-nix.inputs.nixpkgs-regression.follows = "empty";
+    hydra-nix.inputs.nixpkgs.follows = "hydra-nixpkgs";
+    hydra-nix.url = "github:NixOS/nix/2.21-maintenance";
+    hydra-nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11-small";
+    hydra.inputs.nix.follows = "hydra-nix";
+    hydra.inputs.nixpkgs.follows = "hydra-nixpkgs";
+    hydra.url = "github:NixOS/hydra/hydra.nixos.org-nix-2.21";
     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,9 @@
 
     services.hydra = {
       enable = true;
+
+      package = inputs.hydra.packages.${pkgs.system}.default;
+
       # remote builders set in /etc/nix/machines + localhost
       buildMachinesFiles = [
         (pkgs.runCommand "etc-nix-machines" { machines = config.environment.etc."nix/machines".text; } ''