flake.nix: reduce number of nixpkgs instances we track
Martin Weinelt committed
May 5, 2025 at 15:46 UTC
d18f73c49a8505c9634612f797986d2b6e016c80
2 files changed
+47
-62
flake.lock
+9
-49
@@ -413,21 +413,6 @@
413
"type": "github"
414
}
415
},
416
- "nixpkgs-24_11": {
417
- "locked": {
418
- "lastModified": 1734083684,
419
- "narHash": "sha256-5fNndbndxSx5d+C/D0p/VF32xDiJCJzyOqorOYW4JEo=",
420
- "owner": "NixOS",
421
- "repo": "nixpkgs",
422
- "rev": "314e12ba369ccdb9b352a4db26ff419f7c49fa84",
423
- "type": "github"
424
- },
425
- "original": {
426
- "id": "nixpkgs",
427
- "ref": "nixos-24.11",
428
- "type": "indirect"
429
- }
430
- },
416
"nixpkgs-unstable": {
417
"locked": {
418
"lastModified": 1746300365,
@@ -444,37 +429,6 @@
429
"type": "github"
430
}
431
},
447
- "nixpkgs_2": {
448
- "locked": {
449
- "lastModified": 1732014248,
450
- "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=",
451
- "owner": "NixOS",
452
- "repo": "nixpkgs",
453
- "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367",
454
- "type": "github"
455
- },
456
- "original": {
457
- "id": "nixpkgs",
458
- "ref": "nixos-unstable",
459
- "type": "indirect"
460
- }
461
- },
462
- "nixpkgs_3": {
463
- "locked": {
464
- "lastModified": 1745377448,
465
- "narHash": "sha256-jhZDfXVKdD7TSEGgzFJQvEEZ2K65UMiqW5YJ2aIqxMA=",
466
- "owner": "nixos",
467
- "repo": "nixpkgs",
468
- "rev": "507b63021ada5fee621b6ca371c4fca9ca46f52c",
469
- "type": "github"
470
- },
471
- "original": {
472
- "owner": "nixos",
473
- "ref": "nixpkgs-unstable",
474
- "repo": "nixpkgs",
475
- "type": "github"
476
- }
477
- },
432
"pre-commit": {
433
"inputs": {
434
"flake-compat": "flake-compat_2",
@@ -550,8 +504,12 @@
504
"inputs": {
505
"blobs": "blobs",
506
"flake-compat": "flake-compat_3",
553
- "nixpkgs": "nixpkgs_2",
554
- "nixpkgs-24_11": "nixpkgs-24_11"
507
+ "nixpkgs": [
508
+ "nixpkgs-unstable"
509
+ ],
510
+ "nixpkgs-24_11": [
511
+ "nixpkgs"
512
+ ]
513
},
514
"locked": {
515
"lastModified": 1746220417,
@@ -654,7 +612,9 @@
612
},
613
"treefmt-nix": {
614
"inputs": {
657
- "nixpkgs": "nixpkgs_3"
615
+ "nixpkgs": [
616
+ "nixpkgs-unstable"
617
+ ]
618
},
619
"locked": {
620
"lastModified": 1746216483,
flake.nix
+38
-13
@@ -1,5 +1,5 @@
1
{
2
- description = "Nixos org infra";
2
+ description = "NixOS.org infra";
3
4
nixConfig.extra-substituters = [ "https://nixos-infra-dev.cachix.org" ];
5
nixConfig.extra-trusted-public-keys = [
@@ -7,24 +7,34 @@
7
];
8
9
inputs = {
10
- agenix.url = "github:ryantm/agenix";
11
- agenix.inputs.nixpkgs.follows = "nixpkgs";
10
+ agenix = {
11
+ url = "github:ryantm/agenix";
12
+ inputs.nixpkgs.follows = "nixpkgs";
13
+ };
14
13
- hydra.url = "github:NixOS/hydra";
14
- hydra.inputs.nixpkgs.follows = "nixpkgs";
15
+ hydra = {
16
+ url = "github:NixOS/hydra";
17
+ inputs.nixpkgs.follows = "nixpkgs";
18
+ };
19
16
- nixos-channel-scripts.url = "github:NixOS/nixos-channel-scripts";
17
- nixos-channel-scripts.inputs.nixpkgs.follows = "nixpkgs";
20
+ nixos-channel-scripts = {
21
+ url = "github:NixOS/nixos-channel-scripts";
22
+ inputs.nixpkgs.follows = "nixpkgs";
23
+ };
24
19
- rfc39.url = "github:NixOS/rfc39";
20
- rfc39.inputs.nixpkgs.follows = "nixpkgs";
25
+ rfc39 = {
26
+ url = "github:NixOS/rfc39";
27
+ inputs.nixpkgs.follows = "nixpkgs";
28
+ };
29
30
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11-small";
31
32
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
33
26
- flake-parts.url = "github:hercules-ci/flake-parts";
27
- flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs";
34
+ flake-parts = {
35
+ url = "github:hercules-ci/flake-parts";
36
+ inputs.nixpkgs-lib.follows = "nixpkgs";
37
+ };
38
39
darwin = {
40
url = "github:LnL7/nix-darwin/nix-darwin-24.11";
@@ -32,7 +42,11 @@
42
};
43
44
flake-utils.url = "github:numtide/flake-utils";
35
- treefmt-nix.url = "github:numtide/treefmt-nix";
45
+
46
+ treefmt-nix = {
47
+ url = "github:numtide/treefmt-nix";
48
+ inputs.nixpkgs.follows = "nixpkgs-unstable";
49
+ };
50
51
colmena = {
52
url = "github:zhaofengli/colmena";
@@ -42,19 +56,30 @@
56
stable.follows = "nixpkgs";
57
};
58
};
59
+
60
disko = {
61
url = "github:nix-community/disko";
62
inputs.nixpkgs.follows = "nixpkgs";
63
};
64
+
65
srvos = {
66
url = "github:numtide/srvos";
67
inputs.nixpkgs.follows = "nixpkgs";
68
};
53
- simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver";
69
+
70
+ simple-nixos-mailserver = {
71
+ url = "gitlab:simple-nixos-mailserver/nixos-mailserver";
72
+ inputs = {
73
+ nixpkgs.follows = "nixpkgs-unstable";
74
+ nixpkgs-24_11.follows = "nixpkgs";
75
+ };
76
+ };
77
+
78
sops-nix = {
79
url = "github:Mic92/sops-nix";
80
inputs.nixpkgs.follows = "nixpkgs";
81
};
82
+
83
first-time-contribution-tagger = {
84
url = "github:Janik-Haag/first-time-contribution-tagger";
85
inputs = {