common: override buildbot-nix nix-eval-jobs with patched curl

devusb · Nov 24, 2024 · 1fddaf0 · 1fddaf0
1 parent 3275b97
commit 1fddaf0
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 5 deletions.
diff --git a/flake.lock b/flake.lock
diff --git 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
@@ -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
@@ -21,6 +21,8 @@
         };
       in
       {
+        curl-netrc-fix = curl;
+        git-netrc-fix = git;
         nix = prev.nix.override {
           inherit git curl;
         };