@cryptotaxi247 / infra-1 / commits / bad95720

build: update to nixos-24.05

Martin Weinelt committed Oct 19, 2024 at 17:25 UTC bad9572035cb1468f10728a50be453245ebf421a
3 files changed +91 -41
build/flake.lock
+87 -28
@@ -138,6 +138,28 @@
138 "type": "github"
139 }
140 },
141 + "flake-parts": {
142 + "inputs": {
143 + "nixpkgs-lib": [
144 + "hydra",
145 + "nix",
146 + "nixpkgs"
147 + ]
148 + },
149 + "locked": {
150 + "lastModified": 1712014858,
151 + "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=",
152 + "owner": "hercules-ci",
153 + "repo": "flake-parts",
154 + "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d",
155 + "type": "github"
156 + },
157 + "original": {
158 + "owner": "hercules-ci",
159 + "repo": "flake-parts",
160 + "type": "github"
161 + }
162 + },
163 "flake-utils": {
164 "locked": {
165 "lastModified": 1659877975,
@@ -171,6 +193,41 @@
193 "type": "github"
194 }
195 },
196 + "git-hooks-nix": {
197 + "inputs": {
198 + "flake-compat": [
199 + "hydra",
200 + "nix"
201 + ],
202 + "gitignore": [
203 + "hydra",
204 + "nix"
205 + ],
206 + "nixpkgs": [
207 + "hydra",
208 + "nix",
209 + "nixpkgs"
210 + ],
211 + "nixpkgs-stable": [
212 + "hydra",
213 + "nix",
214 + "nixpkgs"
215 + ]
216 + },
217 + "locked": {
218 + "lastModified": 1726745158,
219 + "narHash": "sha256-D5AegvGoEjt4rkKedmxlSEmC+nNLMBPWFxvmYnVLhjk=",
220 + "owner": "cachix",
221 + "repo": "git-hooks.nix",
222 + "rev": "4e743a6920eab45e8ba0fbe49dc459f1423a4b74",
223 + "type": "github"
224 + },
225 + "original": {
226 + "owner": "cachix",
227 + "repo": "git-hooks.nix",
228 + "type": "github"
229 + }
230 + },
231 "home-manager": {
232 "inputs": {
233 "nixpkgs": [
@@ -197,20 +254,18 @@
254 "nix": "nix",
255 "nixpkgs": [
256 "nixpkgs"
200 - ],
201 - "nixpkgs-for-fileset": "nixpkgs-for-fileset"
257 + ]
258 },
259 "locked": {
204 - "lastModified": 1724788397,
205 - "narHash": "sha256-yV9BAOjFPRytFwSZjDnanYWIFIO/qvCPGSjTKawHzo0=",
260 + "lastModified": 1728364038,
261 + "narHash": "sha256-khkY1GG43/VUBt6g7Egt0Zz0V/rXxnDUpOLtanFum7Y=",
262 "owner": "NixOS",
263 "repo": "hydra",
208 - "rev": "bc6f08d2335788436dd600efcba921047e5ffe90",
264 + "rev": "c69e30122bf7e7a7d3de70dc2418263c6e44159b",
265 "type": "github"
266 },
267 "original": {
268 "owner": "NixOS",
213 - "ref": "h.n.o-2.19",
269 "repo": "hydra",
270 "type": "github"
271 }
@@ -235,43 +290,47 @@
290 "type": "github"
291 }
292 },
238 - "lowdown-src": {
293 + "libgit2": {
294 "flake": false,
295 "locked": {
241 - "lastModified": 1633514407,
242 - "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=",
243 - "owner": "kristapsdz",
244 - "repo": "lowdown",
245 - "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8",
296 + "lastModified": 1715853528,
297 + "narHash": "sha256-J2rCxTecyLbbDdsyBWn9w7r3pbKRMkI9E7RvRgAqBdY=",
298 + "owner": "libgit2",
299 + "repo": "libgit2",
300 + "rev": "36f7e21ad757a3dacc58cf7944329da6bc1d6e96",
301 "type": "github"
302 },
303 "original": {
249 - "owner": "kristapsdz",
250 - "repo": "lowdown",
304 + "owner": "libgit2",
305 + "ref": "v1.8.1",
306 + "repo": "libgit2",
307 "type": "github"
308 }
309 },
310 "nix": {
311 "inputs": {
312 "flake-compat": "flake-compat_2",
257 - "lowdown-src": "lowdown-src",
313 + "flake-parts": "flake-parts",
314 + "git-hooks-nix": "git-hooks-nix",
315 + "libgit2": "libgit2",
316 "nixpkgs": [
317 "hydra",
318 "nixpkgs"
319 ],
320 + "nixpkgs-23-11": "nixpkgs-23-11",
321 "nixpkgs-regression": "nixpkgs-regression"
322 },
323 "locked": {
265 - "lastModified": 1706208340,
266 - "narHash": "sha256-wNyHUEIiKKVs6UXrUzhP7RSJQv0A8jckgcuylzftl8k=",
324 + "lastModified": 1726787955,
325 + "narHash": "sha256-XFznzb8L4SdUm9u+w3DPpMWJhffuv+/6+aiVl00slns=",
326 "owner": "NixOS",
327 "repo": "nix",
269 - "rev": "2c4bb93ba5a97e7078896ebc36385ce172960e4e",
328 + "rev": "a7fdef6858dd45b9d7bda7c92324c63faee7f509",
329 "type": "github"
330 },
331 "original": {
332 "owner": "NixOS",
274 - "ref": "2.19-maintenance",
333 + "ref": "2.24-maintenance",
334 "repo": "nix",
335 "type": "github"
336 }
@@ -333,19 +392,19 @@
392 "type": "github"
393 }
394 },
336 - "nixpkgs-for-fileset": {
395 + "nixpkgs-23-11": {
396 "locked": {
338 - "lastModified": 1706098335,
339 - "narHash": "sha256-r3dWjT8P9/Ah5m5ul4WqIWD8muj5F+/gbCdjiNVBKmU=",
397 + "lastModified": 1717159533,
398 + "narHash": "sha256-oamiKNfr2MS6yH64rUn99mIZjc45nGJlj9eGth/3Xuw=",
399 "owner": "NixOS",
400 "repo": "nixpkgs",
342 - "rev": "a77ab169a83a4175169d78684ddd2e54486ac651",
401 + "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446",
402 "type": "github"
403 },
404 "original": {
405 "owner": "NixOS",
347 - "ref": "nixos-23.11",
406 "repo": "nixpkgs",
407 + "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446",
408 "type": "github"
409 }
410 },
@@ -367,16 +426,16 @@
426 },
427 "nixpkgs_2": {
428 "locked": {
370 - "lastModified": 1720535198,
371 - "narHash": "sha256-zwVvxrdIzralnSbcpghA92tWu2DV2lwv89xZc8MTrbg=",
429 + "lastModified": 1729121208,
430 + "narHash": "sha256-oeFwnIqeerefKg1xdRd6XVWjWouwgjSp1rFGCWPZbiU=",
431 "owner": "NixOS",
432 "repo": "nixpkgs",
374 - "rev": "205fd4226592cc83fd4c0885a3e4c9c400efabb5",
433 + "rev": "84c2b044c021d61a36ef6f7dc451f4e57e750d53",
434 "type": "github"
435 },
436 "original": {
437 "owner": "NixOS",
379 - "ref": "nixos-23.11-small",
438 + "ref": "nixos-24.05-small",
439 "repo": "nixpkgs",
440 "type": "github"
441 }
build/flake.nix
+3 -2
@@ -1,5 +1,5 @@
1 {
2 - inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11-small";
2 + inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05-small";
3
4 inputs.agenix.url = "github:ryantm/agenix";
5 inputs.agenix.inputs.nixpkgs.follows = "nixpkgs";
@@ -10,7 +10,7 @@
10 inputs.disko.url = "github:nix-community/disko";
11 inputs.disko.inputs.nixpkgs.follows = "nixpkgs";
12
13 - inputs.hydra.url = "github:NixOS/hydra/h.n.o-2.19";
13 + inputs.hydra.url = "github:NixOS/hydra";
14 inputs.hydra.inputs.nixpkgs.follows = "nixpkgs";
15 inputs.nix.follows = "hydra/nix";
16
@@ -54,6 +54,7 @@
54
55 nixpkgs.overlays = [
56 nix.overlays.default
57 + hydra.overlays.default
58 nixos-channel-scripts.overlays.default
59 rfc39.overlays.default
60 ];
build/hydra.nix
+1 -11
@@ -8,6 +8,7 @@ in
8
9 {
10 services.hydra-dev.enable = true;
11 + services.hydra-dev.package = pkgs.hydra;
12 services.hydra-dev.logo = ./hydra-logo.png;
13 services.hydra-dev.hydraURL = "https://hydra.nixos.org";
14 services.hydra-dev.notificationSender = "edolstra@gmail.com";
@@ -60,17 +61,6 @@ in
61 </hydra_notify>
62 '';
63
63 - # Work around https://github.com/NixOS/hydra/issues/1337
64 - services.hydra-dev.package = pkgs.hydra.overrideAttrs (
65 - _final: prev: {
66 - postPatch = ''
67 - ${prev.postPatch or ""}
68 - rm src/lib/Hydra/Plugin/DeclarativeJobsets.pm
69 - rm t/Hydra/Plugin/DeclarativeJobsets/basic.t
70 - '';
71 - }
72 - );
73 -
64 # eats memory as if it was free
65 systemd.services.hydra-notify.enable = false;
66