Skip to content

Commit 6e1e7f4

Browse files
authored
Merge pull request #410 from nix-community/rm-nix-eval-jobs
worker: remove pinned nix-eval-jobs
2 parents 04f1424 + b611c59 commit 6e1e7f4

File tree

3 files changed

+14
-31
lines changed

3 files changed

+14
-31
lines changed

flake.lock

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

nix/nix-eval-jobs.nix

Lines changed: 0 additions & 24 deletions
This file was deleted.

nix/worker.nix

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ let
99
inherit (config.services.buildbot-nix) packages;
1010
home = "/var/lib/buildbot-worker";
1111
buildbotDir = "${home}/worker";
12+
minimumNixEvalJobsVersion = "2.26.0";
1213
in
1314
{
1415
_file = ./worker.nix;
@@ -52,7 +53,7 @@ in
5253
};
5354
nixEvalJobs.package = lib.mkOption {
5455
type = lib.types.package;
55-
default = pkgs.callPackage ./nix-eval-jobs.nix { };
56+
default = pkgs.nix-eval-jobs;
5657
description = "nix-eval-jobs to use for evaluation";
5758
};
5859
masterUrl = lib.mkOption {
@@ -67,6 +68,12 @@ in
6768
};
6869
};
6970
config = lib.mkIf cfg.enable {
71+
assertions = [
72+
{
73+
assertion = lib.versionAtLeast config.services.buildbot-nix.worker.nixEvalJobs.package.version minimumNixEvalJobsVersion;
74+
message = "buildbot-nix requires nix-eval-jobs >= ${minimumNixEvalJobsVersion}";
75+
}
76+
];
7077
nix.settings.extra-allowed-users = [ "buildbot-worker" ];
7178

7279
# Allow buildbot-worker to create gcroots

0 commit comments

Comments
 (0)