hydra: return to master and update
Martin Weinelt committed
Jul 16, 2026 at 15:07 UTC
3ec535438d215465daa83da7c7cde0efc7ad61bc
2 files changed
+15
-27
flake.lock
+14
-18
@@ -450,9 +450,7 @@
450
"hydra": {
451
"inputs": {
452
"foreman": "foreman",
453
- "nix": [
454
- "nix"
455
- ],
453
+ "nix": "nix",
454
"nix-eval-jobs": "nix-eval-jobs",
455
"nixpkgs": [
456
"nixpkgs"
@@ -462,16 +460,15 @@
460
]
461
},
462
"locked": {
465
- "lastModified": 1783580739,
466
- "narHash": "sha256-JKTgQmWFTkEWA9lzK0ikc6zuKSZ3zojlq6PPPWR0Pkk=",
463
+ "lastModified": 1784223924,
464
+ "narHash": "sha256-aLoklefjR3NGGAgVArBwlC/7mcH9Z0zgUQfIoq9G7EA=",
465
"owner": "NixOS",
466
"repo": "hydra",
469
- "rev": "5d83743a96b9f262b8707e2209f8296ea354ac1f",
467
+ "rev": "c5e3a66c668a1c9858e1d8e9b22db7ffb9b9a6e0",
468
"type": "github"
469
},
470
"original": {
471
"owner": "NixOS",
474
- "ref": "hydra.nixos.org",
472
"repo": "hydra",
473
"type": "github"
474
}
@@ -545,16 +542,16 @@
542
"nix": {
543
"flake": false,
544
"locked": {
548
- "lastModified": 1781104715,
549
- "narHash": "sha256-qaInXBHddYnhnWQMLLmWusSFcaHwwlfysHD8QJaLnds=",
550
- "owner": "tomberek",
545
+ "lastModified": 1783987836,
546
+ "narHash": "sha256-UkRzz0meYeuSQt5rQodwfiSe1If+5JojDP7Kxk0beXM=",
547
+ "owner": "NixOS",
548
"repo": "nix",
552
- "rev": "15ee316650a282432676207e472de8d2f7a77f6c",
549
+ "rev": "aa2613fa02ca6199fe0ebf61a0f7f6d781d32a47",
550
"type": "github"
551
},
552
"original": {
556
- "owner": "tomberek",
557
- "ref": "backport-15855-to-2.34-maintenance",
553
+ "owner": "NixOS",
554
+ "ref": "2.35-maintenance",
555
"repo": "nix",
556
"type": "github"
557
}
@@ -562,16 +559,16 @@
559
"nix-eval-jobs": {
560
"flake": false,
561
"locked": {
565
- "lastModified": 1773356729,
566
- "narHash": "sha256-OFGRoJOYhvZ3Enk5a8vMy0QNcG5ZxyzFhyHMrwKXde8=",
562
+ "lastModified": 1784200986,
563
+ "narHash": "sha256-/C5wyGYe4uMKKH26vy3knpwP/hvjOHO/58cySL8ADC4=",
564
"owner": "NixOS",
565
"repo": "nix-eval-jobs",
569
- "rev": "65ebf5b7cd453a27af09cf02b1fc57b3568cc4b7",
566
+ "rev": "a0cd02231c58974a6b5aaa3712069b071047162e",
567
"type": "github"
568
},
569
"original": {
570
"owner": "NixOS",
574
- "ref": "v2.34.1",
571
+ "ref": "v2.35.0",
572
"repo": "nix-eval-jobs",
573
"type": "github"
574
}
@@ -803,7 +800,6 @@
800
"freescout": "freescout",
801
"geolite2-asn-mmdb": "geolite2-asn-mmdb",
802
"hydra": "hydra",
806
- "nix": "nix",
803
"nix-index": "nix-index",
804
"nixocaine": "nixocaine",
805
"nixpkgs": "nixpkgs",
flake.nix
+1
-9
@@ -25,17 +25,9 @@
25
geolite2-asn-mmdb.url = "https://github.com/P3TERX/GeoLite.mmdb/raw/download/GeoLite2-ASN.mmdb";
26
geolite2-asn-mmdb.flake = false;
27
28
- nix = {
29
- #url = "github:NixOS/nix/2.34-maintenance";
30
- # TMP S3 upload abortions: https://github.com/NixOS/nix/pull/15949
31
- url = "github:tomberek/nix/backport-15855-to-2.34-maintenance";
32
- flake = false;
33
- };
34
-
28
hydra = {
36
- url = "github:NixOS/hydra/hydra.nixos.org";
29
+ url = "github:NixOS/hydra";
30
inputs.nixpkgs.follows = "nixpkgs";
38
- inputs.nix.follows = "nix";
31
inputs.treefmt-nix.follows = "treefmt-nix";
32
};
33