@cryptotaxi247 / infra / commits / 8dce5f3c

flake.nix: Track hydra master branch

The master branch has caught up with the patches we've been carrying for the last 12 months or so. We also start following the nix-eval-jobs version pinned in hydra, so that we stay compatible. Flake lock file updates: • Updated input 'hydra': 'github:NixOS/hydra/c3b6e7b425325b2ea65a0ed638c5913ac32d1a28' (2025-02-16) → 'github:NixOS/hydra/1c52c4c0ed596ea71de370562ed5af1604bd2183' (2025-04-07) • Removed input 'hydra/libgit2' • Updated input 'hydra/nix': 'github:NixOS/nix/a7fdef6858dd45b9d7bda7c92324c63faee7f509' (2024-09-19) → 'github:NixOS/nix/a4962f73b5fc874d4b16baef47921daf349addfc' (2025-04-07) • Removed input 'hydra/nix/libgit2' • Updated input 'hydra/nix-eval-jobs': follows 'nix-eval-jobs' → 'github:nix-community/nix-eval-jobs/cba718bafe5dc1607c2b6761ecf53c641a6f3b21' (2025-04-07) • Removed input 'nix-eval-jobs' • Removed input 'nix-eval-jobs/flake-parts' • Removed input 'nix-eval-jobs/flake-parts/nixpkgs-lib' • Removed input 'nix-eval-jobs/nix-github-actions' • Removed input 'nix-eval-jobs/nix-github-actions/nixpkgs' • Removed input 'nix-eval-jobs/nixpkgs' • Removed input 'nix-eval-jobs/treefmt-nix' • Removed input 'nix-eval-jobs/treefmt-nix/nixpkgs'

Martin Weinelt committed Apr 8, 2025 at 03:02 UTC 8dce5f3c28dfad46112d4c6a9a5e6214b23f50ab
2 files changed +14 -115
flake.lock
+13 -110
@@ -222,27 +222,6 @@
222 "type": "github"
223 }
224 },
225 - "flake-parts_2": {
226 - "inputs": {
227 - "nixpkgs-lib": [
228 - "nix-eval-jobs",
229 - "nixpkgs"
230 - ]
231 - },
232 - "locked": {
233 - "lastModified": 1736143030,
234 - "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=",
235 - "owner": "hercules-ci",
236 - "repo": "flake-parts",
237 - "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de",
238 - "type": "github"
239 - },
240 - "original": {
241 - "owner": "hercules-ci",
242 - "repo": "flake-parts",
243 - "type": "github"
244 - }
245 - },
225 "flake-utils": {
226 "inputs": {
227 "systems": "systems_2"
@@ -324,47 +303,26 @@
303 },
304 "hydra": {
305 "inputs": {
327 - "libgit2": "libgit2",
306 "nix": "nix",
329 - "nix-eval-jobs": [
330 - "nix-eval-jobs"
331 - ],
307 + "nix-eval-jobs": "nix-eval-jobs",
308 "nixpkgs": [
309 "nixpkgs"
310 ]
311 },
312 "locked": {
337 - "lastModified": 1739708846,
338 - "narHash": "sha256-WJCBCifrYsbHPrXaCjGtHGU/cBJnUXApPmeEMa1LsbM=",
313 + "lastModified": 1744052751,
314 + "narHash": "sha256-pcZA2SA7nskxsvDYp3nzF5V258b67YrZONv9G3PhLCE=",
315 "owner": "NixOS",
316 "repo": "hydra",
341 - "rev": "c3b6e7b425325b2ea65a0ed638c5913ac32d1a28",
317 + "rev": "1c52c4c0ed596ea71de370562ed5af1604bd2183",
318 "type": "github"
319 },
320 "original": {
321 "owner": "NixOS",
346 - "ref": "hydra.nixos.org",
322 "repo": "hydra",
323 "type": "github"
324 }
325 },
351 - "libgit2": {
352 - "flake": false,
353 - "locked": {
354 - "lastModified": 1715853528,
355 - "narHash": "sha256-J2rCxTecyLbbDdsyBWn9w7r3pbKRMkI9E7RvRgAqBdY=",
356 - "owner": "libgit2",
357 - "repo": "libgit2",
358 - "rev": "36f7e21ad757a3dacc58cf7944329da6bc1d6e96",
359 - "type": "github"
360 - },
361 - "original": {
362 - "owner": "libgit2",
363 - "ref": "v1.8.1",
364 - "repo": "libgit2",
365 - "type": "github"
366 - }
367 - },
326 "nix": {
327 "inputs": {
328 "flake-compat": [
@@ -376,10 +334,6 @@
334 "git-hooks-nix": [
335 "hydra"
336 ],
379 - "libgit2": [
380 - "hydra",
381 - "libgit2"
382 - ],
337 "nixpkgs": [
338 "hydra",
339 "nixpkgs"
@@ -392,41 +346,33 @@
346 ]
347 },
348 "locked": {
395 - "lastModified": 1726787955,
396 - "narHash": "sha256-XFznzb8L4SdUm9u+w3DPpMWJhffuv+/6+aiVl00slns=",
349 + "lastModified": 1744030329,
350 + "narHash": "sha256-r+psCOW77vTSTNbxTVrYHeh6OgB0QukbnyUVDwg8s4I=",
351 "owner": "NixOS",
352 "repo": "nix",
399 - "rev": "a7fdef6858dd45b9d7bda7c92324c63faee7f509",
353 + "rev": "a4962f73b5fc874d4b16baef47921daf349addfc",
354 "type": "github"
355 },
356 "original": {
357 "owner": "NixOS",
404 - "ref": "2.24-maintenance",
358 + "ref": "2.28-maintenance",
359 "repo": "nix",
360 "type": "github"
361 }
362 },
363 "nix-eval-jobs": {
410 - "inputs": {
411 - "flake-parts": "flake-parts_2",
412 - "nix-github-actions": "nix-github-actions_2",
413 - "nixpkgs": [
414 - "nixpkgs"
415 - ],
416 - "treefmt-nix": "treefmt-nix"
417 - },
364 + "flake": false,
365 "locked": {
419 - "lastModified": 1741973191,
420 - "narHash": "sha256-iUccMDDwfc/cIRVtyoi9xtoYbdA33fIkS+nTpb/lqqo=",
366 + "lastModified": 1744018595,
367 + "narHash": "sha256-v5n6t49X7MOpqS9j0FtI6TWOXvxuZMmGsp2OfUK5QfA=",
368 "owner": "nix-community",
369 "repo": "nix-eval-jobs",
423 - "rev": "ca94443b9621c610af09ff1806434bd84cd817e6",
370 + "rev": "cba718bafe5dc1607c2b6761ecf53c641a6f3b21",
371 "type": "github"
372 },
373 "original": {
374 "owner": "nix-community",
375 "repo": "nix-eval-jobs",
429 - "rev": "ca94443b9621c610af09ff1806434bd84cd817e6",
376 "type": "github"
377 }
378 },
@@ -451,27 +397,6 @@
397 "type": "github"
398 }
399 },
454 - "nix-github-actions_2": {
455 - "inputs": {
456 - "nixpkgs": [
457 - "nix-eval-jobs",
458 - "nixpkgs"
459 - ]
460 - },
461 - "locked": {
462 - "lastModified": 1731952509,
463 - "narHash": "sha256-p4gB3Rhw8R6Ak4eMl8pqjCPOLCZRqaehZxdZ/mbFClM=",
464 - "owner": "nix-community",
465 - "repo": "nix-github-actions",
466 - "rev": "7b5f051df789b6b20d259924d349a9ba3319b226",
467 - "type": "github"
468 - },
469 - "original": {
470 - "owner": "nix-community",
471 - "repo": "nix-github-actions",
472 - "type": "github"
473 - }
474 - },
400 "nixos-channel-scripts": {
401 "inputs": {
402 "nixpkgs": [
@@ -635,7 +560,6 @@
560 "hydra",
561 "nix"
562 ],
638 - "nix-eval-jobs": "nix-eval-jobs",
563 "nixos-channel-scripts": "nixos-channel-scripts",
564 "nixpkgs": "nixpkgs",
565 "nixpkgs-unstable": "nixpkgs-unstable",
@@ -643,7 +567,7 @@
567 "simple-nixos-mailserver": "simple-nixos-mailserver",
568 "sops-nix": "sops-nix",
569 "srvos": "srvos",
646 - "treefmt-nix": "treefmt-nix_2"
570 + "treefmt-nix": "treefmt-nix"
571 }
572 },
573 "simple-nixos-mailserver": {
@@ -753,27 +677,6 @@
677 }
678 },
679 "treefmt-nix": {
756 - "inputs": {
757 - "nixpkgs": [
758 - "nix-eval-jobs",
759 - "nixpkgs"
760 - ]
761 - },
762 - "locked": {
763 - "lastModified": 1736154270,
764 - "narHash": "sha256-p2r8xhQZ3TYIEKBoiEhllKWQqWNJNoT9v64Vmg4q8Zw=",
765 - "owner": "numtide",
766 - "repo": "treefmt-nix",
767 - "rev": "13c913f5deb3a5c08bb810efd89dc8cb24dd968b",
768 - "type": "github"
769 - },
770 - "original": {
771 - "owner": "numtide",
772 - "repo": "treefmt-nix",
773 - "type": "github"
774 - }
775 - },
776 - "treefmt-nix_2": {
680 "inputs": {
681 "nixpkgs": "nixpkgs_3"
682 },
flake.nix
+1 -5
@@ -10,12 +10,8 @@
10 agenix.url = "github:ryantm/agenix";
11 agenix.inputs.nixpkgs.follows = "nixpkgs";
12
13 - nix-eval-jobs.url = "github:nix-community/nix-eval-jobs?rev=ca94443b9621c610af09ff1806434bd84cd817e6";
14 - nix-eval-jobs.inputs.nixpkgs.follows = "nixpkgs";
15 -
16 - hydra.url = "github:NixOS/hydra/hydra.nixos.org";
13 + hydra.url = "github:NixOS/hydra";
14 hydra.inputs.nixpkgs.follows = "nixpkgs";
18 - hydra.inputs.nix-eval-jobs.follows = "nix-eval-jobs";
15 nix.follows = "hydra/nix";
16
17 nixos-channel-scripts.url = "github:NixOS/nixos-channel-scripts";