Use jenkins-job-builder from nixos-24.05

Signed-off-by: Joonas Rautiola <[email protected]>
tiiuae · Dec 9, 2024 · 28abc1d · 28abc1d
1 parent a56e5ab
commit 28abc1d
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 0 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -7,6 +7,9 @@
     # Nixpkgs
     nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
 
+    # jenkins-job-builder is broken on 24.11 currently
+    nixpkgs-24-05.url = "github:nixos/nixpkgs/nixos-24.05";
+
     # Allows us to structure the flake with the NixOS module system
     flake-parts.url = "github:hercules-ci/flake-parts";
     flake-root.url = "github:srid/flake-root";

diff --git a/hosts/azure/jenkins-controller/configuration.nix b/hosts/azure/jenkins-controller/configuration.nix
@@ -102,6 +102,15 @@ in
     ];
   };
 
+  # https://github.com/NixOS/nixpkgs/issues/362054
+  # Use jenkins-job-builder from nixos-24.05, as it's broken in 24.11.
+  # Needs to be an overlay so that it propagates to service.jenkins.jobBuilder
+  nixpkgs.overlays = [
+    (_: _: {
+      inherit ((import inputs.nixpkgs-24-05 { inherit (pkgs) system; })) jenkins-job-builder;
+    })
+  ];
+
   services.jenkins = {
     enable = true;
     listenAddress = "localhost";