@cryptotaxi247 / infra-1 / commits / 3bfe2842

delft: merge back rhea to the main flake

There's now only one flake and one nixpkgs version for all 3 main core NixOS infra machines.

Pierre Bourdon committed Feb 9, 2024 at 23:46 UTC 3bfe2842337f1ecd1e4d3304ba678ac2aed925c3
4 files changed +193 -247
delft/flake.lock
+171 -5
@@ -25,7 +25,7 @@
25 },
26 "cpiotools": {
27 "inputs": {
28 - "nixpkgs": "nixpkgs"
28 + "nixpkgs": "nixpkgs_3"
29 },
30 "locked": {
31 "lastModified": 1655642194,
@@ -63,6 +63,22 @@
63 "type": "github"
64 }
65 },
66 + "flake-compat": {
67 + "flake": false,
68 + "locked": {
69 + "lastModified": 1673956053,
70 + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
71 + "owner": "edolstra",
72 + "repo": "flake-compat",
73 + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
74 + "type": "github"
75 + },
76 + "original": {
77 + "owner": "edolstra",
78 + "repo": "flake-compat",
79 + "type": "github"
80 + }
81 + },
82 "flake-utils": {
83 "inputs": {
84 "systems": "systems_2"
@@ -102,10 +118,90 @@
118 "type": "github"
119 }
120 },
121 + "hydra": {
122 + "inputs": {
123 + "nix": "nix",
124 + "nixpkgs": "nixpkgs",
125 + "nixpkgs-for-fileset": "nixpkgs-for-fileset"
126 + },
127 + "locked": {
128 + "lastModified": 1706309642,
129 + "narHash": "sha256-Lk1ErBYJR08sJKdFhYvMgf6ILUirTXAiYUobjWkO5Uk=",
130 + "owner": "NixOS",
131 + "repo": "hydra",
132 + "rev": "838648c0cebc12e0527ede3ac5f71b64670b5f83",
133 + "type": "github"
134 + },
135 + "original": {
136 + "owner": "NixOS",
137 + "ref": "nix-2.19",
138 + "repo": "hydra",
139 + "type": "github"
140 + }
141 + },
142 + "hydra-scale-equinix-metal": {
143 + "inputs": {
144 + "nixpkgs": "nixpkgs_2"
145 + },
146 + "locked": {
147 + "lastModified": 1706717366,
148 + "narHash": "sha256-ZbN3sU4N2Zq4jgbUg5PeEC/8GwN9wdhGduzgudzPObQ=",
149 + "owner": "DeterminateSystems",
150 + "repo": "hydra-scale-equinix-metal",
151 + "rev": "e78390eba106a24393341aa3c7030cfa15a7ac23",
152 + "type": "github"
153 + },
154 + "original": {
155 + "owner": "DeterminateSystems",
156 + "repo": "hydra-scale-equinix-metal",
157 + "type": "github"
158 + }
159 + },
160 + "lowdown-src": {
161 + "flake": false,
162 + "locked": {
163 + "lastModified": 1633514407,
164 + "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=",
165 + "owner": "kristapsdz",
166 + "repo": "lowdown",
167 + "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8",
168 + "type": "github"
169 + },
170 + "original": {
171 + "owner": "kristapsdz",
172 + "repo": "lowdown",
173 + "type": "github"
174 + }
175 + },
176 + "nix": {
177 + "inputs": {
178 + "flake-compat": "flake-compat",
179 + "lowdown-src": "lowdown-src",
180 + "nixpkgs": [
181 + "hydra",
182 + "nixpkgs"
183 + ],
184 + "nixpkgs-regression": "nixpkgs-regression"
185 + },
186 + "locked": {
187 + "lastModified": 1706208340,
188 + "narHash": "sha256-wNyHUEIiKKVs6UXrUzhP7RSJQv0A8jckgcuylzftl8k=",
189 + "owner": "NixOS",
190 + "repo": "nix",
191 + "rev": "2c4bb93ba5a97e7078896ebc36385ce172960e4e",
192 + "type": "github"
193 + },
194 + "original": {
195 + "owner": "NixOS",
196 + "ref": "2.19-maintenance",
197 + "repo": "nix",
198 + "type": "github"
199 + }
200 + },
201 "nix-netboot-serve": {
202 "inputs": {
203 "cpiotools": "cpiotools",
108 - "nixpkgs": "nixpkgs_2"
204 + "nixpkgs": "nixpkgs_4"
205 },
206 "locked": {
207 "lastModified": 1664484325,
@@ -122,6 +218,70 @@
218 }
219 },
220 "nixpkgs": {
221 + "locked": {
222 + "lastModified": 1701615100,
223 + "narHash": "sha256-7VI84NGBvlCTduw2aHLVB62NvCiZUlALLqBe5v684Aw=",
224 + "owner": "NixOS",
225 + "repo": "nixpkgs",
226 + "rev": "e9f06adb793d1cca5384907b3b8a4071d5d7cb19",
227 + "type": "github"
228 + },
229 + "original": {
230 + "owner": "NixOS",
231 + "ref": "nixos-23.05",
232 + "repo": "nixpkgs",
233 + "type": "github"
234 + }
235 + },
236 + "nixpkgs-for-fileset": {
237 + "locked": {
238 + "lastModified": 1706098335,
239 + "narHash": "sha256-r3dWjT8P9/Ah5m5ul4WqIWD8muj5F+/gbCdjiNVBKmU=",
240 + "owner": "NixOS",
241 + "repo": "nixpkgs",
242 + "rev": "a77ab169a83a4175169d78684ddd2e54486ac651",
243 + "type": "github"
244 + },
245 + "original": {
246 + "owner": "NixOS",
247 + "ref": "nixos-23.11",
248 + "repo": "nixpkgs",
249 + "type": "github"
250 + }
251 + },
252 + "nixpkgs-regression": {
253 + "locked": {
254 + "lastModified": 1643052045,
255 + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=",
256 + "owner": "NixOS",
257 + "repo": "nixpkgs",
258 + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
259 + "type": "github"
260 + },
261 + "original": {
262 + "owner": "NixOS",
263 + "repo": "nixpkgs",
264 + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
265 + "type": "github"
266 + }
267 + },
268 + "nixpkgs_2": {
269 + "locked": {
270 + "lastModified": 1702830618,
271 + "narHash": "sha256-lvhwIvRwhOLgzbRuYkqHy4M5cQHYs4ktL6/hyuBS6II=",
272 + "owner": "nixos",
273 + "repo": "nixpkgs",
274 + "rev": "91a00709aebb3602f172a0bf47ba1ef013e34835",
275 + "type": "github"
276 + },
277 + "original": {
278 + "owner": "nixos",
279 + "ref": "nixos-unstable",
280 + "repo": "nixpkgs",
281 + "type": "github"
282 + }
283 + },
284 + "nixpkgs_3": {
285 "locked": {
286 "lastModified": 1655567057,
287 "narHash": "sha256-Cc5hQSMsTzOHmZnYm8OSJ5RNUp22bd5NADWLHorULWQ=",
@@ -137,7 +297,7 @@
297 "type": "github"
298 }
299 },
140 - "nixpkgs_2": {
300 + "nixpkgs_4": {
301 "locked": {
302 "lastModified": 1655306633,
303 "narHash": "sha256-nv4FfWWV/dEelByjXJtJkoDPOHIsKfLq50RN3Hqq5Yk=",
@@ -153,7 +313,7 @@
313 "type": "github"
314 }
315 },
156 - "nixpkgs_3": {
316 + "nixpkgs_5": {
317 "locked": {
318 "lastModified": 1707479090,
319 "narHash": "sha256-bu7KtDaTLL67VsYOJmIcPkERCnecxCeg3NwsLOxMGeU=",
@@ -193,8 +353,14 @@
353 "root": {
354 "inputs": {
355 "agenix": "agenix",
356 + "hydra": "hydra",
357 + "hydra-scale-equinix-metal": "hydra-scale-equinix-metal",
358 + "nix": [
359 + "hydra",
360 + "nix"
361 + ],
362 "nix-netboot-serve": "nix-netboot-serve",
197 - "nixpkgs": "nixpkgs_3",
363 + "nixpkgs": "nixpkgs_5",
364 "rfc39": "rfc39"
365 }
366 },
delft/flake.nix
+22 -6
@@ -1,26 +1,33 @@
1 {
2 inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11-small";
3 +
4 + inputs.agenix.url = "github:ryantm/agenix";
5 + inputs.agenix.inputs.nixpkgs.follows = "nixpkgs";
6 +
7 + inputs.hydra.url = "github:NixOS/hydra/nix-2.19";
8 + inputs.nix.follows = "hydra/nix";
9 +
10 + inputs.hydra-scale-equinix-metal.url = "github:DeterminateSystems/hydra-scale-equinix-metal";
11 +
12 inputs.nix-netboot-serve.url = "github:DeterminateSystems/nix-netboot-serve";
13
14 inputs.rfc39.url = "github:NixOS/rfc39";
15 inputs.rfc39.inputs.nixpkgs.follows = "nixpkgs";
16
8 - inputs.agenix = {
9 - url = "github:ryantm/agenix";
10 - inputs.nixpkgs.follows = "nixpkgs";
11 - };
12 -
13 - outputs = flakes @ { self, agenix, nixpkgs, nix-netboot-serve, rfc39 }:
17 + outputs = flakes @ { self, agenix, hydra, hydra-scale-equinix-metal, nix, nixpkgs, nix-netboot-serve, rfc39 }:
18 let
19 inherit (nixpkgs) lib;
20
21 flakesModule = {
22 imports = [
23 agenix.nixosModules.age
24 + hydra.nixosModules.hydra
25 + hydra-scale-equinix-metal.nixosModules.default
26 nix-netboot-serve.nixosModules.nix-netboot-serve
27 ];
28
29 nixpkgs.overlays = [
30 + nix.overlays.default
31 rfc39.overlays.default
32 ];
33 };
@@ -45,6 +52,15 @@
52 ];
53 };
54
55 + nixosConfigurations.rhea = nixpkgs.lib.nixosSystem {
56 + system = "x86_64-linux";
57 +
58 + modules = [
59 + flakesModule
60 + ./rhea/configuration.nix
61 + ];
62 + };
63 +
64 nixopsConfigurations.default =
65 { inherit nixpkgs; }
66 // import ./network.nix flakes;
delft/rhea/flake.lock deleted
-193
@@ -1,193 +0,0 @@
1 -{
2 - "nodes": {
3 - "flake-compat": {
4 - "flake": false,
5 - "locked": {
6 - "lastModified": 1673956053,
7 - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
8 - "owner": "edolstra",
9 - "repo": "flake-compat",
10 - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
11 - "type": "github"
12 - },
13 - "original": {
14 - "owner": "edolstra",
15 - "repo": "flake-compat",
16 - "type": "github"
17 - }
18 - },
19 - "hydra": {
20 - "inputs": {
21 - "nix": "nix",
22 - "nixpkgs": "nixpkgs",
23 - "nixpkgs-for-fileset": "nixpkgs-for-fileset"
24 - },
25 - "locked": {
26 - "lastModified": 1706309642,
27 - "narHash": "sha256-Lk1ErBYJR08sJKdFhYvMgf6ILUirTXAiYUobjWkO5Uk=",
28 - "owner": "NixOS",
29 - "repo": "hydra",
30 - "rev": "838648c0cebc12e0527ede3ac5f71b64670b5f83",
31 - "type": "github"
32 - },
33 - "original": {
34 - "owner": "NixOS",
35 - "ref": "nix-2.19",
36 - "repo": "hydra",
37 - "type": "github"
38 - }
39 - },
40 - "hydra-scale-equinix-metal": {
41 - "inputs": {
42 - "nixpkgs": "nixpkgs_2"
43 - },
44 - "locked": {
45 - "lastModified": 1680536851,
46 - "narHash": "sha256-I8jHYivqyFz1JuUFAIGcYznNlv35Shr3oKBsQFaoBrY=",
47 - "owner": "DeterminateSystems",
48 - "repo": "hydra-scale-equinix-metal",
49 - "rev": "6166086b234334ea242c6d9958b6c3e594867382",
50 - "type": "github"
51 - },
52 - "original": {
53 - "owner": "DeterminateSystems",
54 - "repo": "hydra-scale-equinix-metal",
55 - "type": "github"
56 - }
57 - },
58 - "lowdown-src": {
59 - "flake": false,
60 - "locked": {
61 - "lastModified": 1633514407,
62 - "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=",
63 - "owner": "kristapsdz",
64 - "repo": "lowdown",
65 - "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8",
66 - "type": "github"
67 - },
68 - "original": {
69 - "owner": "kristapsdz",
70 - "repo": "lowdown",
71 - "type": "github"
72 - }
73 - },
74 - "nix": {
75 - "inputs": {
76 - "flake-compat": "flake-compat",
77 - "lowdown-src": "lowdown-src",
78 - "nixpkgs": [
79 - "hydra",
80 - "nixpkgs"
81 - ],
82 - "nixpkgs-regression": "nixpkgs-regression"
83 - },
84 - "locked": {
85 - "lastModified": 1706208340,
86 - "narHash": "sha256-wNyHUEIiKKVs6UXrUzhP7RSJQv0A8jckgcuylzftl8k=",
87 - "owner": "NixOS",
88 - "repo": "nix",
89 - "rev": "2c4bb93ba5a97e7078896ebc36385ce172960e4e",
90 - "type": "github"
91 - },
92 - "original": {
93 - "owner": "NixOS",
94 - "ref": "2.19-maintenance",
95 - "repo": "nix",
96 - "type": "github"
97 - }
98 - },
99 - "nixpkgs": {
100 - "locked": {
101 - "lastModified": 1701615100,
102 - "narHash": "sha256-7VI84NGBvlCTduw2aHLVB62NvCiZUlALLqBe5v684Aw=",
103 - "owner": "NixOS",
104 - "repo": "nixpkgs",
105 - "rev": "e9f06adb793d1cca5384907b3b8a4071d5d7cb19",
106 - "type": "github"
107 - },
108 - "original": {
109 - "owner": "NixOS",
110 - "ref": "nixos-23.05",
111 - "repo": "nixpkgs",
112 - "type": "github"
113 - }
114 - },
115 - "nixpkgs-for-fileset": {
116 - "locked": {
117 - "lastModified": 1706098335,
118 - "narHash": "sha256-r3dWjT8P9/Ah5m5ul4WqIWD8muj5F+/gbCdjiNVBKmU=",
119 - "owner": "NixOS",
120 - "repo": "nixpkgs",
121 - "rev": "a77ab169a83a4175169d78684ddd2e54486ac651",
122 - "type": "github"
123 - },
124 - "original": {
125 - "owner": "NixOS",
126 - "ref": "nixos-23.11",
127 - "repo": "nixpkgs",
128 - "type": "github"
129 - }
130 - },
131 - "nixpkgs-regression": {
132 - "locked": {
133 - "lastModified": 1643052045,
134 - "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=",
135 - "owner": "NixOS",
136 - "repo": "nixpkgs",
137 - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
138 - "type": "github"
139 - },
140 - "original": {
141 - "owner": "NixOS",
142 - "repo": "nixpkgs",
143 - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
144 - "type": "github"
145 - }
146 - },
147 - "nixpkgs_2": {
148 - "locked": {
149 - "lastModified": 1680213900,
150 - "narHash": "sha256-cIDr5WZIj3EkKyCgj/6j3HBH4Jj1W296z7HTcWj1aMA=",
151 - "owner": "nixos",
152 - "repo": "nixpkgs",
153 - "rev": "e3652e0735fbec227f342712f180f4f21f0594f2",
154 - "type": "github"
155 - },
156 - "original": {
157 - "owner": "nixos",
158 - "ref": "nixos-unstable",
159 - "repo": "nixpkgs",
160 - "type": "github"
161 - }
162 - },
163 - "nixpkgs_3": {
164 - "locked": {
165 - "lastModified": 1707272513,
166 - "narHash": "sha256-AzYRCVpWcCAReIUJs5zAFPQw+Y/P5o5SHLdXZgJ2P1M=",
167 - "owner": "NixOS",
168 - "repo": "nixpkgs",
169 - "rev": "88d128f5f35be5d405fe874495604f3f29350a5f",
170 - "type": "github"
171 - },
172 - "original": {
173 - "owner": "NixOS",
174 - "ref": "nixos-23.11-small",
175 - "repo": "nixpkgs",
176 - "type": "github"
177 - }
178 - },
179 - "root": {
180 - "inputs": {
181 - "hydra": "hydra",
182 - "hydra-scale-equinix-metal": "hydra-scale-equinix-metal",
183 - "nix": [
184 - "hydra",
185 - "nix"
186 - ],
187 - "nixpkgs": "nixpkgs_3"
188 - }
189 - }
190 - },
191 - "root": "root",
192 - "version": 7
193 -}
delft/rhea/flake.nix deleted
-43
@@ -1,43 +0,0 @@
1 -{
2 - inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11-small";
3 - inputs.nix.follows = "hydra/nix";
4 - inputs.hydra.url = "github:NixOS/hydra/nix-2.19";
5 - inputs.hydra-scale-equinix-metal.url = "github:DeterminateSystems/hydra-scale-equinix-metal";
6 -
7 - outputs = flakes @ { self, nixpkgs, nix, hydra, hydra-scale-equinix-metal }: {
8 - nixosConfigurations.rhea = nixpkgs.lib.nixosSystem {
9 - system = "x86_64-linux";
10 -
11 - modules = [
12 - self.nixosModules.common
13 - ./configuration.nix
14 - hydra.nixosModules.hydra
15 - hydra-scale-equinix-metal.nixosModules.default
16 - ];
17 - };
18 -
19 - nixosModules.common =
20 - { config, pkgs, lib, ... }:
21 - {
22 - system.configurationRevision = self.rev
23 - or (throw "Cannot deploy from an unclean source tree!");
24 - #nix.registry.nixpkgs.flake = nixpkgs;
25 - #nix.nixPath = [ "nixpkgs=${nixpkgs}" ];
26 - nixpkgs.overlays = [
27 - nix.overlays.default
28 - ];
29 - };
30 -
31 - devShell.x86_64-linux =
32 - with nixpkgs.legacyPackages.x86_64-linux;
33 - mkShell {
34 - nativeBuildInputs = [
35 - (terraform.withPlugins (p: with p; [ aws p.null external ]))
36 - ];
37 -
38 - shellHook = ''
39 - alias tf=terraform
40 - '';
41 - };
42 - };
43 -}