@cryptotaxi247 / infra / commits / 80a9a4fb

WIP trying to fix S3 upload errors

John Ericson committed Mar 24, 2026 at 18:46 UTC 80a9a4fbd1a312adae5bd6154278b19cef68f89c
3 files changed +22 -56
flake.lock
+18 -54
@@ -319,24 +319,26 @@
319 },
320 "hydra-staging": {
321 "inputs": {
322 - "nix": "nix",
322 + "nix": [
323 + "nix"
324 + ],
325 "nix-eval-jobs": "nix-eval-jobs_2",
326 "nixpkgs": [
327 "nixpkgs"
326 - ],
327 - "treefmt-nix": "treefmt-nix"
328 + ]
329 },
330 "locked": {
330 - "lastModified": 1775339090,
331 - "narHash": "sha256-un4yecNLiiD1Q07nWYeMFlRJniYujARAANe5WlCdETI=",
331 + "lastModified": 1774391370,
332 + "narHash": "sha256-CSILL6ExopBW+lfraxckNo0ouCW8ylSrHezrGKHTARI=",
333 "owner": "NixOS",
334 "repo": "hydra",
334 - "rev": "461fefedcb386f4ecb5b8216690f9d8b8372c83a",
335 + "rev": "2e97e1a32e1383ea46386739551a163479a0ed81",
336 "type": "github"
337 },
338 "original": {
339 "owner": "NixOS",
340 "repo": "hydra",
341 + "rev": "2e97e1a32e1383ea46386739551a163479a0ed81",
342 "type": "github"
343 }
344 },
@@ -363,17 +365,17 @@
365 "nix": {
366 "flake": false,
367 "locked": {
366 - "lastModified": 1772966630,
367 - "narHash": "sha256-qzVtneydMSjNZXzNbxQG9VvJc490keS9RNlbUCfiQas=",
368 - "owner": "NixOS",
369 - "repo": "nix",
370 - "rev": "26842787496f2293c676fb36db38dacfd63497e0",
368 + "lastModified": 1773922402,
369 + "narHash": "sha256-9fBGB4ytkZ1PwFAD3rEr1mc1LhMq90c3qpIO2bazi8Q=",
370 + "owner": "Mic92",
371 + "repo": "nix-1",
372 + "rev": "53e404f7bf1acaa7f7365e95b459a22f3a088c4f",
373 "type": "github"
374 },
375 "original": {
374 - "owner": "NixOS",
375 - "ref": "2.34-maintenance",
376 - "repo": "nix",
376 + "owner": "Mic92",
377 + "ref": "2.34-maintenance-s3-fix",
378 + "repo": "nix-1",
379 "type": "github"
380 }
381 },
@@ -432,23 +434,6 @@
434 "type": "github"
435 }
436 },
435 - "nix_2": {
436 - "flake": false,
437 - "locked": {
438 - "lastModified": 1773922402,
439 - "narHash": "sha256-9fBGB4ytkZ1PwFAD3rEr1mc1LhMq90c3qpIO2bazi8Q=",
440 - "owner": "Mic92",
441 - "repo": "nix-1",
442 - "rev": "53e404f7bf1acaa7f7365e95b459a22f3a088c4f",
443 - "type": "github"
444 - },
445 - "original": {
446 - "owner": "Mic92",
447 - "ref": "2.34-maintenance-s3-fix",
448 - "repo": "nix-1",
449 - "type": "github"
450 - }
451 - },
437 "nixos-channel-scripts": {
438 "inputs": {
439 "nixpkgs": [
@@ -553,7 +538,7 @@
538 "hydra": "hydra",
539 "hydra-staging": "hydra-staging",
540 "nft-prefix-import": "nft-prefix-import",
556 - "nix": "nix_2",
541 + "nix": "nix",
542 "nixos-channel-scripts": "nixos-channel-scripts",
543 "nixpkgs": "nixpkgs",
544 "nixpkgs-swh": "nixpkgs-swh",
@@ -562,7 +547,7 @@
547 "simple-nixos-mailserver": "simple-nixos-mailserver",
548 "sops-nix": "sops-nix",
549 "srvos": "srvos",
565 - "treefmt-nix": "treefmt-nix_2"
550 + "treefmt-nix": "treefmt-nix"
551 }
552 },
553 "simple-nixos-mailserver": {
@@ -660,27 +645,6 @@
645 }
646 },
647 "treefmt-nix": {
663 - "inputs": {
664 - "nixpkgs": [
665 - "hydra-staging",
666 - "nixpkgs"
667 - ]
668 - },
669 - "locked": {
670 - "lastModified": 1773297127,
671 - "narHash": "sha256-6E/yhXP7Oy/NbXtf1ktzmU8SdVqJQ09HC/48ebEGBpk=",
672 - "owner": "numtide",
673 - "repo": "treefmt-nix",
674 - "rev": "71b125cd05fbfd78cab3e070b73544abe24c5016",
675 - "type": "github"
676 - },
677 - "original": {
678 - "owner": "numtide",
679 - "repo": "treefmt-nix",
680 - "type": "github"
681 - }
682 - },
683 - "treefmt-nix_2": {
648 "inputs": {
649 "nixpkgs": [
650 "nixpkgs-unstable"
flake.nix
+3 -1
@@ -27,7 +27,9 @@
27 };
28
29 hydra-staging = {
30 - url = "github:NixOS/hydra";
30 + # Pinning commit until https://github.com/NixOS/hydra/pull/1598 is
31 + # merged, then should go back to tracking latest master.
32 + url = "github:NixOS/hydra/2e97e1a32e1383ea46386739551a163479a0ed81";
33 inputs.nixpkgs.follows = "nixpkgs";
34 # Can be kept in sync I suppose for now.
35 inputs.nix.follows = "nix";
non-critical-infra/hosts/staging-hydra/hydra.nix
+1 -1
@@ -61,7 +61,6 @@ in
61 hydra-aws-credentials = {
62 sopsFile = ../../secrets/hydra-aws-credentials.staging-hydra;
63 format = "binary";
64 - path = "/var/lib/hydra/queue-runner/.aws/credentials";
64 owner = config.systemd.services.hydra-queue-runner-dev.serviceConfig.User;
65 };
66 };
@@ -126,6 +125,7 @@ in
125
126 hydra-queue-runner-dev = {
127 enable = true;
128 + awsCredentialsFile = config.sops.secrets.hydra-aws-credentials.path;
129 settings = {
130 queueTriggerTimerInS = 300;
131 concurrentUploadLimit = 2;