build: update to nixos-24.05

build/flake.nix

@@ -1,5 +1,5 @@
 {
-  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11-small";
+  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05-small";
 
   inputs.agenix.url = "github:ryantm/agenix";
   inputs.agenix.inputs.nixpkgs.follows = "nixpkgs";
@@ -10,7 +10,7 @@
   inputs.disko.url = "github:nix-community/disko";
   inputs.disko.inputs.nixpkgs.follows = "nixpkgs";
 
-  inputs.hydra.url = "github:NixOS/hydra/h.n.o-2.19";
+  inputs.hydra.url = "github:NixOS/hydra";
   inputs.hydra.inputs.nixpkgs.follows = "nixpkgs";
   inputs.nix.follows = "hydra/nix";
 
@@ -54,6 +54,7 @@
 
         nixpkgs.overlays = [
           nix.overlays.default
+          hydra.overlays.default
           nixos-channel-scripts.overlays.default
           rfc39.overlays.default
         ];

build/hydra.nix

@@ -8,6 +8,7 @@ in
 
 {
   services.hydra-dev.enable = true;
+  services.hydra-dev.package = pkgs.hydra;
   services.hydra-dev.logo = ./hydra-logo.png;
   services.hydra-dev.hydraURL = "https://hydra.nixos.org";
   services.hydra-dev.notificationSender = "[email protected]";
@@ -60,17 +61,6 @@ in
     </hydra_notify>
   '';
 
-  # Work around https://github.com/NixOS/hydra/issues/1337
-  services.hydra-dev.package = pkgs.hydra.overrideAttrs (
-    _final: prev: {
-      postPatch = ''
-        ${prev.postPatch or ""}
-        rm src/lib/Hydra/Plugin/DeclarativeJobsets.pm
-        rm t/Hydra/Plugin/DeclarativeJobsets/basic.t
-      '';
-    }
-  );
-
   # eats memory as if it was free
   systemd.services.hydra-notify.enable = false;