hydra-queue-runner-v2: 81e6209e -> 8266ce98
Simon Hauser committed
Nov 24, 2025 at 08:51 UTC
41e718551ab30ffd8fb475f370fb75172f562f8b
3 files changed
+11
-23
non-critical-infra/modules/hydra-queue-builder-v2.nix
+1
-8
@@ -2,12 +2,10 @@
2
config,
3
pkgs,
4
lib,
5
- inputs,
5
...
6
}:
7
let
8
cfg = config.services.hydra-queue-builder-v2;
10
- unstable = import inputs.nixpkgs-unstable { inherit (pkgs) system; };
9
in
10
{
11
options = {
@@ -135,12 +133,7 @@ in
133
134
package = lib.mkOption {
135
type = lib.types.package;
138
- default =
139
- (lib.recurseIntoAttrs (
140
- pkgs.callPackage ../packages/hydra-queue-runner {
141
- inherit (unstable) nixVersions openssl;
142
- }
143
- )).builder;
136
+ default = (lib.recurseIntoAttrs (pkgs.callPackage ../packages/hydra-queue-runner { })).builder;
137
};
138
};
139
};
non-critical-infra/modules/hydra-queue-runner-v2.nix
+1
-8
@@ -2,14 +2,12 @@
2
config,
3
pkgs,
4
lib,
5
- inputs,
5
...
6
}:
7
let
8
cfg = config.services.hydra-queue-runner-v2;
9
10
format = pkgs.formats.toml { };
12
- unstable = import inputs.nixpkgs-unstable { inherit (pkgs) system; };
11
in
12
{
13
options = {
@@ -187,12 +185,7 @@ in
185
};
186
package = lib.mkOption {
187
type = lib.types.package;
190
- default =
191
- (lib.recurseIntoAttrs (
192
- pkgs.callPackage ../packages/hydra-queue-runner {
193
- inherit (unstable) nixVersions openssl;
194
- }
195
- )).runner;
188
+ default = (lib.recurseIntoAttrs (pkgs.callPackage ../packages/hydra-queue-runner { })).runner;
189
};
190
};
191
};
non-critical-infra/packages/hydra-queue-runner/default.nix
+9
-7
@@ -14,14 +14,14 @@
14
withOtel ? false,
15
}:
16
let
17
- version = "unstable-2025-11-05";
17
+ version = "unstable-2025-11-27";
18
src = fetchFromGitHub {
19
owner = "helsinki-systems";
20
repo = "hydra-queue-runner";
21
- rev = "81e6209e9107a62e9fba3d29f2ead8e9cf35bea1";
22
- hash = "sha256-MGoC9bLa9Ih66UbHkxGuAGvj/GfPZzG9N6liiHX0Sos=";
21
+ rev = "8266ce9818393ee9d0fe3ffd7bcde3eb09c2221f";
22
+ hash = "sha256-tC4s+opt4BpN0qFx96AXhtUEJj8T7J5C68Hjj2OEetM=";
23
};
24
- cargoHash = "sha256-eFfrwLUnI35WhzO+enr2dTe5blwY00cGQoT5mfs9ZTw=";
24
+ cargoHash = "sha256-49p2mC0DmsdgWdj4mWZf7SZj4Gd9eQFqTGRDzvMYSQM=";
25
nativeBuildInputs = [
26
pkg-config
27
protobuf
@@ -32,7 +32,7 @@ let
32
zlib
33
protobuf
34
35
- nixVersions.nix_2_31
35
+ nixVersions.nix_2_32
36
nlohmann_json
37
libsodium
38
boost
@@ -60,10 +60,11 @@ in
60
61
buildAndTestSubdir = "queue-runner";
62
buildFeatures = lib.optional withOtel "otel";
63
+ doCheck = false;
64
65
postInstall = ''
66
wrapProgram $out/bin/queue-runner \
66
- --prefix PATH : ${lib.makeBinPath [ nixVersions.nix_2_31 ]} \
67
+ --prefix PATH : ${lib.makeBinPath [ nixVersions.nix_2_32 ]} \
68
--set-default JEMALLOC_SYS_WITH_MALLOC_CONF "background_thread:true,narenas:1,tcache:false,dirty_decay_ms:0,muzzy_decay_ms:0,abort_conf:true"
69
'';
70
@@ -86,10 +87,11 @@ in
87
88
buildAndTestSubdir = "builder";
89
buildFeatures = lib.optional withOtel "otel";
90
+ doCheck = false;
91
92
postInstall = ''
93
wrapProgram $out/bin/builder \
92
- --prefix PATH : ${lib.makeBinPath [ nixVersions.nix_2_31 ]} \
94
+ --prefix PATH : ${lib.makeBinPath [ nixVersions.nix_2_32 ]} \
95
--set-default JEMALLOC_SYS_WITH_MALLOC_CONF "background_thread:true,narenas:1,tcache:false,dirty_decay_ms:0,muzzy_decay_ms:0,abort_conf:true"
96
'';
97