@cryptotaxi247 / infra / commits / 88cc8aba

Use different hydra input for staging, drop hydra-queue-runner input

The queue-runner has been merged upstream into NixOS/hydra (PR #1579). This removes the separate helsinki-systems/hydra-queue-runner flake input and uses the modules/packages from the hydra flake directly. Separate input means we can bump them independently in the same repo.

Jörg Thalheim committed Mar 17, 2026 at 19:04 UTC 88cc8abaf3fc534e9adfd00d6c19c9a9b1a791b8
6 files changed +55 -31
builders/common/hydra-queue-builder.nix
+2 -2
@@ -7,7 +7,7 @@
7
8 {
9 imports = [
10 - inputs.hydra-queue-runner.nixosModules.queue-builder
10 + inputs.hydra-staging.nixosModules.linux-builder
11 ];
12
13 config = lib.mkIf false {
@@ -16,7 +16,7 @@
16 owner = "hydra-queue-builder";
17 };
18
19 - services.queue-builder-dev = {
19 + services.hydra-queue-builder-dev = {
20 enable = true;
21 queueRunnerAddr = "https://queue-runner.hydra.nixos.org";
22 authorizationFile = config.age.secrets."queue-runner-token".path;
flake.lock
+45 -18
@@ -315,32 +315,25 @@
315 "type": "github"
316 }
317 },
318 - "hydra-queue-runner": {
318 + "hydra-staging": {
319 "inputs": {
320 - "flake-utils": [
321 - "flake-utils"
322 - ],
320 + "nix": "nix_2",
321 + "nix-eval-jobs": "nix-eval-jobs_2",
322 "nixpkgs": [
323 "nixpkgs"
325 - ],
326 - "nixpkgs-unstable": [
327 - "nixpkgs-unstable"
328 - ],
329 - "treefmt-nix": [
330 - "treefmt-nix"
324 ]
325 },
326 "locked": {
334 - "lastModified": 1773309570,
335 - "narHash": "sha256-HWlyDU/4dkxYIiKsnf0I6Zws2QyOG6o8/olPAVikKEo=",
336 - "owner": "helsinki-systems",
337 - "repo": "hydra-queue-runner",
338 - "rev": "12152675138355f430f495c86231f7e8559b63c3",
327 + "lastModified": 1773854374,
328 + "narHash": "sha256-MLUAqgIW7DazJf6PD0V1fHHyG0AzRjzcK5TLrsMDc8o=",
329 + "owner": "NixOS",
330 + "repo": "hydra",
331 + "rev": "2e1036c3eb1906df471c73ab0bab21d0e1d5b430",
332 "type": "github"
333 },
334 "original": {
342 - "owner": "helsinki-systems",
343 - "repo": "hydra-queue-runner",
335 + "owner": "NixOS",
336 + "repo": "hydra",
337 "type": "github"
338 }
339 },
@@ -398,6 +391,23 @@
391 "type": "github"
392 }
393 },
394 + "nix-eval-jobs_2": {
395 + "flake": false,
396 + "locked": {
397 + "lastModified": 1773356729,
398 + "narHash": "sha256-OFGRoJOYhvZ3Enk5a8vMy0QNcG5ZxyzFhyHMrwKXde8=",
399 + "owner": "NixOS",
400 + "repo": "nix-eval-jobs",
401 + "rev": "65ebf5b7cd453a27af09cf02b1fc57b3568cc4b7",
402 + "type": "github"
403 + },
404 + "original": {
405 + "owner": "NixOS",
406 + "ref": "v2.34.1",
407 + "repo": "nix-eval-jobs",
408 + "type": "github"
409 + }
410 + },
411 "nix-github-actions": {
412 "inputs": {
413 "nixpkgs": [
@@ -419,6 +429,23 @@
429 "type": "github"
430 }
431 },
432 + "nix_2": {
433 + "flake": false,
434 + "locked": {
435 + "lastModified": 1772966630,
436 + "narHash": "sha256-qzVtneydMSjNZXzNbxQG9VvJc490keS9RNlbUCfiQas=",
437 + "owner": "NixOS",
438 + "repo": "nix",
439 + "rev": "26842787496f2293c676fb36db38dacfd63497e0",
440 + "type": "github"
441 + },
442 + "original": {
443 + "owner": "NixOS",
444 + "ref": "2.34-maintenance",
445 + "repo": "nix",
446 + "type": "github"
447 + }
448 + },
449 "nixos-channel-scripts": {
450 "inputs": {
451 "nixpkgs": [
@@ -521,7 +548,7 @@
548 "flake-utils": "flake-utils",
549 "freescout": "freescout",
550 "hydra": "hydra",
524 - "hydra-queue-runner": "hydra-queue-runner",
551 + "hydra-staging": "hydra-staging",
552 "nft-prefix-import": "nft-prefix-import",
553 "nixos-channel-scripts": "nixos-channel-scripts",
554 "nixpkgs": "nixpkgs",
flake.nix
+2 -5
@@ -17,12 +17,9 @@
17 inputs.nixpkgs.follows = "nixpkgs";
18 };
19
20 - hydra-queue-runner = {
21 - url = "github:helsinki-systems/hydra-queue-runner";
22 - inputs.flake-utils.follows = "flake-utils";
20 + hydra-staging = {
21 + url = "github:NixOS/hydra";
22 inputs.nixpkgs.follows = "nixpkgs";
24 - inputs.nixpkgs-unstable.follows = "nixpkgs-unstable";
25 - inputs.treefmt-nix.follows = "treefmt-nix";
23 };
24
25 nixos-channel-scripts = {
macs/hydra-queue-builder.nix
+2 -2
@@ -8,7 +8,7 @@
8 {
9 imports = [
10 inputs.agenix.darwinModules.age
11 - inputs.hydra-queue-runner.darwinModules.queue-builder
11 + inputs.hydra-staging.nixosModules.darwin-builder
12 ];
13
14 config = lib.mkIf false {
@@ -17,7 +17,7 @@
17 owner = "hydra-queue-builder";
18 };
19
20 - services.queue-builder-dev = {
20 + services.hydra-queue-builder-dev = {
21 enable = true;
22 queueRunnerAddr = "https://queue-runner.hydra.nixos.org";
23 authorizationFile = config.age.secrets."queue-runner-token".path;
non-critical-infra/hosts/staging-hydra/default.nix
+1 -1
@@ -10,7 +10,7 @@
10 ];
11
12 nixpkgs.overlays = [
13 - inputs.hydra.overlays.default
13 + inputs.hydra-staging.overlays.default
14 ];
15
16 boot = {
non-critical-infra/hosts/staging-hydra/hydra.nix
+3 -3
@@ -14,8 +14,8 @@ let
14 in
15 {
16 imports = [
17 - inputs.hydra.nixosModules.hydra
18 - inputs.hydra-queue-runner.nixosModules.queue-runner
17 + inputs.hydra-staging.nixosModules.web-app
18 + inputs.hydra-staging.nixosModules.queue-runner
19 ];
20
21 networking.firewall.allowedTCPPorts = [
@@ -124,7 +124,7 @@ in
124 '';
125 };
126
127 - queue-runner-dev = {
127 + hydra-queue-runner-dev = {
128 enable = true;
129 settings = {
130 queueTriggerTimerInS = 300;