Skip to content

Commit 772d7f8

Browse files
committed
chopper: override buildbot-nix nix-eval-jobs with patched curl
1 parent 3275b97 commit 772d7f8

File tree

4 files changed

+26
-5
lines changed

4 files changed

+26
-5
lines changed

flake.lock

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
inputs = {
33
nixpkgs.url = "nixpkgs/nixos-unstable";
4-
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-23.11";
4+
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.05";
55
nix-packages = {
66
url = "github:devusb/nix-packages";
77
inputs.nixpkgs.follows = "nixpkgs";

hosts/chopper/buildbot.nix

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,25 @@
3737
services.buildbot-nix.worker = {
3838
enable = true;
3939
workerPasswordFile = config.sops.secrets.buildbot_nix_worker_password.path;
40+
nixEvalJobs.package = pkgs.stable.nix-eval-jobs.overrideAttrs (old: {
41+
src = pkgs.fetchFromGitHub {
42+
owner = "nix-community";
43+
repo = "nix-eval-jobs";
44+
# https://github.com/nix-community/nix-eval-jobs/pull/325
45+
rev = "e5a2c008b922c1a7642f93d29645403b20c70fec";
46+
sha256 = "sha256-UIY4EFvzsxYK8FhT6RSsmVDLqDBHDMzROy1g4YisIgY=";
47+
};
48+
49+
buildInputs = with pkgs; [
50+
boost
51+
(pkgs.nixVersions.nix_2_24.override {
52+
git = git-netrc-fix;
53+
curl = curl-netrc-fix;
54+
})
55+
curl-netrc-fix
56+
nlohmann_json
57+
];
58+
});
4059
};
4160

4261
nix.distributedBuilds = true;

hosts/common/curl-netrc/default.nix

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
};
2222
in
2323
{
24+
curl-netrc-fix = curl;
25+
git-netrc-fix = git;
2426
nix = prev.nix.override {
2527
inherit git curl;
2628
};

0 commit comments

Comments
 (0)