From 1fddaf0498d9c9c95f8fe0043edee1935d9609fd Mon Sep 17 00:00:00 2001
From: Morgan Helton <mhelton@gmail.com>
Date: Sun, 24 Nov 2024 15:24:26 -0600
Subject: [PATCH] common: override buildbot-nix nix-eval-jobs with patched curl

---
 flake.lock                          |  8 ++++----
 flake.nix                           |  2 +-
 hosts/chopper/buildbot.nix          | 19 +++++++++++++++++++
 hosts/common/curl-netrc/default.nix |  2 ++
 4 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/flake.lock b/flake.lock
index f13b47b..74f5ed3 100644
--- a/flake.lock
+++ b/flake.lock
@@ -499,16 +499,16 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1720535198,
-        "narHash": "sha256-zwVvxrdIzralnSbcpghA92tWu2DV2lwv89xZc8MTrbg=",
+        "lastModified": 1731797254,
+        "narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "205fd4226592cc83fd4c0885a3e4c9c400efabb5",
+        "rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-23.11",
+        "ref": "nixos-24.05",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index ef9cc8b..5df25f4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,7 +1,7 @@
 {
   inputs = {
     nixpkgs.url = "nixpkgs/nixos-unstable";
-    nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-23.11";
+    nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.05";
     nix-packages = {
       url = "github:devusb/nix-packages";
       inputs.nixpkgs.follows = "nixpkgs";
diff --git a/hosts/chopper/buildbot.nix b/hosts/chopper/buildbot.nix
index 8998c29..ebcdff7 100644
--- a/hosts/chopper/buildbot.nix
+++ b/hosts/chopper/buildbot.nix
@@ -37,6 +37,25 @@
   services.buildbot-nix.worker = {
     enable = true;
     workerPasswordFile = config.sops.secrets.buildbot_nix_worker_password.path;
+    nixEvalJobs.package = pkgs.stable.nix-eval-jobs.overrideAttrs (old: {
+      src = pkgs.fetchFromGitHub {
+        owner = "nix-community";
+        repo = "nix-eval-jobs";
+        # https://github.com/nix-community/nix-eval-jobs/pull/325
+        rev = "e5a2c008b922c1a7642f93d29645403b20c70fec";
+        sha256 = "sha256-UIY4EFvzsxYK8FhT6RSsmVDLqDBHDMzROy1g4YisIgY=";
+      };
+
+      buildInputs = with pkgs; [
+        boost
+        (pkgs.nixVersions.nix_2_24.override {
+          git = git-netrc-fix;
+          curl = curl-netrc-fix;
+        })
+        curl-netrc-fix
+        nlohmann_json
+      ];
+    });
   };
 
   nix.distributedBuilds = true;
diff --git a/hosts/common/curl-netrc/default.nix b/hosts/common/curl-netrc/default.nix
index 9a42072..9ad591a 100644
--- a/hosts/common/curl-netrc/default.nix
+++ b/hosts/common/curl-netrc/default.nix
@@ -21,6 +21,8 @@
         };
       in
       {
+        curl-netrc-fix = curl;
+        git-netrc-fix = git;
         nix = prev.nix.override {
           inherit git curl;
         };