File tree Expand file tree Collapse file tree 4 files changed +27
-60
lines changed
Expand file tree Collapse file tree 4 files changed +27
-60
lines changed Original file line number Diff line number Diff line change 77 flake-parts . url = "github:hercules-ci/flake-parts" ;
88 flake-parts . inputs . nixpkgs-lib . follows = "nixpkgs" ;
99
10- nix-eval-jobs . url = "github:nix-community/nix-eval-jobs?ref=expose-more-build-status" ;
11- nix-eval-jobs . inputs . nixpkgs . follows = "nixpkgs" ;
12- nix-eval-jobs . inputs . flake-parts . follows = "flake-parts" ;
13- nix-eval-jobs . inputs . treefmt-nix . follows = "treefmt-nix" ;
14-
1510 # used for development
1611 treefmt-nix . url = "github:numtide/treefmt-nix" ;
1712 treefmt-nix . inputs . nixpkgs . follows = "nixpkgs" ;
4338 (
4439 { pkgs , ... } :
4540 {
46- services . buildbot-nix . worker . nixEvalJobsPackage =
47- lib . mkDefault
48- inputs . nix-eval-jobs . packages . ${ pkgs . hostPlatform . system } . default ;
4941 services . buildbot-nix . worker . buildbotNixpkgs =
5042 lib . mkDefault
5143 inputs . nixpkgs . legacyPackages . ${ pkgs . hostPlatform . system } ;
Original file line number Diff line number Diff line change 1+ {
2+ fetchFromGitHub ,
3+ nix-eval-jobs ,
4+ nixVersions ,
5+ boost ,
6+ curl ,
7+ nlohmann_json ,
8+ } :
9+ nix-eval-jobs . overrideAttrs ( oldAttrs : {
10+ src = fetchFromGitHub {
11+ owner = "nix-community" ;
12+ repo = "nix-eval-jobs" ;
13+ # https://github.com/nix-community/nix-eval-jobs/pull/325
14+ rev = "91ca6cffaecbe5d0df79d2d97d4b286252c17aef" ;
15+ sha256 = "sha256-uTroApEsrSVxGtKcnrOBSEGImS3UolxMmy/9z97FpWE=" ;
16+ } ;
17+
18+ buildInputs = [
19+ boost
20+ nixVersions . nix_2_24
21+ curl
22+ nlohmann_json
23+ ] ;
24+ } )
Original file line number Diff line number Diff line change 2020 default = config . networking . hostName ;
2121 description = "The buildbot worker name." ;
2222 } ;
23- nixEvalJobsPackage = lib . mkOption {
23+ nixEvalJobs . package = lib . mkOption {
2424 type = lib . types . package ;
25+ default = pkgs . callPackage ./nix-eval-jobs.nix { } ;
2526 description = "nix-eval-jobs to use for evaluation" ;
2627 } ;
2728 buildbotNixpkgs = lib . mkOption {
7677 pkgs . git
7778 pkgs . openssh
7879 pkgs . nix
79- cfg . nixEvalJobsPackage
80+ cfg . nixEvalJobs . package
8081 ] ;
8182 environment . PYTHONPATH = "${ python . withPackages ( _ : [ cfg . package ] ) } /${ python . sitePackages } " ;
8283 environment . MASTER_URL = cfg . masterUrl ;
You can’t perform that action at this time.
0 commit comments