aboutsummaryrefslogtreecommitdiff
path: root/flakes
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2025-03-14 00:44:57 +0100
committerIsmaël Bouya <ismael.bouya@normalesup.org>2025-03-14 01:48:04 +0100
commite3ab1517fc501b91f9a8caaccc53b96533e680a8 (patch)
tree6e24e240382ec34790253449c8766c2aff90a8b2 /flakes
parent930866cf94823edf6d9b91436f30e605a90c7174 (diff)
downloadNix-master.tar.gz
Nix-master.tar.zst
Nix-master.zip
Replace from-raw-flake in colmenaHEADmaster
Diffstat (limited to 'flakes')
-rw-r--r--flakes/flake.lock326
-rw-r--r--flakes/lib/flake.lock41
-rw-r--r--flakes/lib/flake.nix7
3 files changed, 277 insertions, 97 deletions
diff --git a/flakes/flake.lock b/flakes/flake.lock
index 2b6d84a..93ab029 100644
--- a/flakes/flake.lock
+++ b/flakes/flake.lock
@@ -194,20 +194,20 @@
194 "inputs": { 194 "inputs": {
195 "flake-compat": "flake-compat", 195 "flake-compat": "flake-compat",
196 "flake-utils": "flake-utils_3", 196 "flake-utils": "flake-utils_3",
197 "nix-github-actions": "nix-github-actions",
197 "nixpkgs": "nixpkgs_3", 198 "nixpkgs": "nixpkgs_3",
198 "stable": "stable" 199 "stable": "stable"
199 }, 200 },
200 "locked": { 201 "locked": {
201 "lastModified": 1687954574, 202 "lastModified": 1739900653,
202 "narHash": "sha256-YasVTaNXq2xqZdejyIhuyqvNypmx+K/Y1ZZ4+raeeII=", 203 "narHash": "sha256-hPSLvw6AZQYrZyGI6Uq4XgST7benF/0zcCpugn/P0yM=",
203 "owner": "immae", 204 "owner": "zhaofengli",
204 "repo": "colmena", 205 "repo": "colmena",
205 "rev": "e427171150a35e23204c4c15a2483358d22a0eff", 206 "rev": "2370d4336eda2a9ef29fce10fa7076ae011983ab",
206 "type": "github" 207 "type": "github"
207 }, 208 },
208 "original": { 209 "original": {
209 "owner": "immae", 210 "owner": "zhaofengli",
210 "ref": "add-lib-get-flake",
211 "repo": "colmena", 211 "repo": "colmena",
212 "type": "github" 212 "type": "github"
213 } 213 }
@@ -216,20 +216,20 @@
216 "inputs": { 216 "inputs": {
217 "flake-compat": "flake-compat_2", 217 "flake-compat": "flake-compat_2",
218 "flake-utils": "flake-utils_7", 218 "flake-utils": "flake-utils_7",
219 "nix-github-actions": "nix-github-actions_2",
219 "nixpkgs": "nixpkgs_12", 220 "nixpkgs": "nixpkgs_12",
220 "stable": "stable_2" 221 "stable": "stable_2"
221 }, 222 },
222 "locked": { 223 "locked": {
223 "lastModified": 1687954574, 224 "lastModified": 1739900653,
224 "narHash": "sha256-YasVTaNXq2xqZdejyIhuyqvNypmx+K/Y1ZZ4+raeeII=", 225 "narHash": "sha256-hPSLvw6AZQYrZyGI6Uq4XgST7benF/0zcCpugn/P0yM=",
225 "owner": "immae", 226 "owner": "zhaofengli",
226 "repo": "colmena", 227 "repo": "colmena",
227 "rev": "e427171150a35e23204c4c15a2483358d22a0eff", 228 "rev": "2370d4336eda2a9ef29fce10fa7076ae011983ab",
228 "type": "github" 229 "type": "github"
229 }, 230 },
230 "original": { 231 "original": {
231 "owner": "immae", 232 "owner": "zhaofengli",
232 "ref": "add-lib-get-flake",
233 "repo": "colmena", 233 "repo": "colmena",
234 "type": "github" 234 "type": "github"
235 } 235 }
@@ -238,20 +238,20 @@
238 "inputs": { 238 "inputs": {
239 "flake-compat": "flake-compat_3", 239 "flake-compat": "flake-compat_3",
240 "flake-utils": "flake-utils_10", 240 "flake-utils": "flake-utils_10",
241 "nix-github-actions": "nix-github-actions_3",
241 "nixpkgs": "nixpkgs_19", 242 "nixpkgs": "nixpkgs_19",
242 "stable": "stable_3" 243 "stable": "stable_3"
243 }, 244 },
244 "locked": { 245 "locked": {
245 "lastModified": 1687954574, 246 "lastModified": 1739900653,
246 "narHash": "sha256-YasVTaNXq2xqZdejyIhuyqvNypmx+K/Y1ZZ4+raeeII=", 247 "narHash": "sha256-hPSLvw6AZQYrZyGI6Uq4XgST7benF/0zcCpugn/P0yM=",
247 "owner": "immae", 248 "owner": "zhaofengli",
248 "repo": "colmena", 249 "repo": "colmena",
249 "rev": "e427171150a35e23204c4c15a2483358d22a0eff", 250 "rev": "2370d4336eda2a9ef29fce10fa7076ae011983ab",
250 "type": "github" 251 "type": "github"
251 }, 252 },
252 "original": { 253 "original": {
253 "owner": "immae", 254 "owner": "zhaofengli",
254 "ref": "add-lib-get-flake",
255 "repo": "colmena", 255 "repo": "colmena",
256 "type": "github" 256 "type": "github"
257 } 257 }
@@ -260,20 +260,20 @@
260 "inputs": { 260 "inputs": {
261 "flake-compat": "flake-compat_4", 261 "flake-compat": "flake-compat_4",
262 "flake-utils": "flake-utils_32", 262 "flake-utils": "flake-utils_32",
263 "nix-github-actions": "nix-github-actions_4",
263 "nixpkgs": "nixpkgs_50", 264 "nixpkgs": "nixpkgs_50",
264 "stable": "stable_4" 265 "stable": "stable_4"
265 }, 266 },
266 "locked": { 267 "locked": {
267 "lastModified": 1687954574, 268 "lastModified": 1739900653,
268 "narHash": "sha256-YasVTaNXq2xqZdejyIhuyqvNypmx+K/Y1ZZ4+raeeII=", 269 "narHash": "sha256-hPSLvw6AZQYrZyGI6Uq4XgST7benF/0zcCpugn/P0yM=",
269 "owner": "immae", 270 "owner": "zhaofengli",
270 "repo": "colmena", 271 "repo": "colmena",
271 "rev": "e427171150a35e23204c4c15a2483358d22a0eff", 272 "rev": "2370d4336eda2a9ef29fce10fa7076ae011983ab",
272 "type": "github" 273 "type": "github"
273 }, 274 },
274 "original": { 275 "original": {
275 "owner": "immae", 276 "owner": "zhaofengli",
276 "ref": "add-lib-get-flake",
277 "repo": "colmena", 277 "repo": "colmena",
278 "type": "github" 278 "type": "github"
279 } 279 }
@@ -282,20 +282,20 @@
282 "inputs": { 282 "inputs": {
283 "flake-compat": "flake-compat_5", 283 "flake-compat": "flake-compat_5",
284 "flake-utils": "flake-utils_35", 284 "flake-utils": "flake-utils_35",
285 "nix-github-actions": "nix-github-actions_5",
285 "nixpkgs": "nixpkgs_58", 286 "nixpkgs": "nixpkgs_58",
286 "stable": "stable_5" 287 "stable": "stable_5"
287 }, 288 },
288 "locked": { 289 "locked": {
289 "lastModified": 1687954574, 290 "lastModified": 1739900653,
290 "narHash": "sha256-YasVTaNXq2xqZdejyIhuyqvNypmx+K/Y1ZZ4+raeeII=", 291 "narHash": "sha256-hPSLvw6AZQYrZyGI6Uq4XgST7benF/0zcCpugn/P0yM=",
291 "owner": "immae", 292 "owner": "zhaofengli",
292 "repo": "colmena", 293 "repo": "colmena",
293 "rev": "e427171150a35e23204c4c15a2483358d22a0eff", 294 "rev": "2370d4336eda2a9ef29fce10fa7076ae011983ab",
294 "type": "github" 295 "type": "github"
295 }, 296 },
296 "original": { 297 "original": {
297 "owner": "immae", 298 "owner": "zhaofengli",
298 "ref": "add-lib-get-flake",
299 "repo": "colmena", 299 "repo": "colmena",
300 "type": "github" 300 "type": "github"
301 } 301 }
@@ -304,20 +304,20 @@
304 "inputs": { 304 "inputs": {
305 "flake-compat": "flake-compat_6", 305 "flake-compat": "flake-compat_6",
306 "flake-utils": "flake-utils_38", 306 "flake-utils": "flake-utils_38",
307 "nix-github-actions": "nix-github-actions_6",
307 "nixpkgs": "nixpkgs_66", 308 "nixpkgs": "nixpkgs_66",
308 "stable": "stable_6" 309 "stable": "stable_6"
309 }, 310 },
310 "locked": { 311 "locked": {
311 "lastModified": 1687954574, 312 "lastModified": 1739900653,
312 "narHash": "sha256-YasVTaNXq2xqZdejyIhuyqvNypmx+K/Y1ZZ4+raeeII=", 313 "narHash": "sha256-hPSLvw6AZQYrZyGI6Uq4XgST7benF/0zcCpugn/P0yM=",
313 "owner": "immae", 314 "owner": "zhaofengli",
314 "repo": "colmena", 315 "repo": "colmena",
315 "rev": "e427171150a35e23204c4c15a2483358d22a0eff", 316 "rev": "2370d4336eda2a9ef29fce10fa7076ae011983ab",
316 "type": "github" 317 "type": "github"
317 }, 318 },
318 "original": { 319 "original": {
319 "owner": "immae", 320 "owner": "zhaofengli",
320 "ref": "add-lib-get-flake",
321 "repo": "colmena", 321 "repo": "colmena",
322 "type": "github" 322 "type": "github"
323 } 323 }
@@ -326,20 +326,20 @@
326 "inputs": { 326 "inputs": {
327 "flake-compat": "flake-compat_7", 327 "flake-compat": "flake-compat_7",
328 "flake-utils": "flake-utils_45", 328 "flake-utils": "flake-utils_45",
329 "nix-github-actions": "nix-github-actions_7",
329 "nixpkgs": "nixpkgs_80", 330 "nixpkgs": "nixpkgs_80",
330 "stable": "stable_7" 331 "stable": "stable_7"
331 }, 332 },
332 "locked": { 333 "locked": {
333 "lastModified": 1687954574, 334 "lastModified": 1739900653,
334 "narHash": "sha256-YasVTaNXq2xqZdejyIhuyqvNypmx+K/Y1ZZ4+raeeII=", 335 "narHash": "sha256-hPSLvw6AZQYrZyGI6Uq4XgST7benF/0zcCpugn/P0yM=",
335 "owner": "immae", 336 "owner": "zhaofengli",
336 "repo": "colmena", 337 "repo": "colmena",
337 "rev": "e427171150a35e23204c4c15a2483358d22a0eff", 338 "rev": "2370d4336eda2a9ef29fce10fa7076ae011983ab",
338 "type": "github" 339 "type": "github"
339 }, 340 },
340 "original": { 341 "original": {
341 "owner": "immae", 342 "owner": "zhaofengli",
342 "ref": "add-lib-get-flake",
343 "repo": "colmena", 343 "repo": "colmena",
344 "type": "github" 344 "type": "github"
345 } 345 }
@@ -2968,7 +2968,7 @@
2968 }, 2968 },
2969 "locked": { 2969 "locked": {
2970 "lastModified": 1, 2970 "lastModified": 1,
2971 "narHash": "sha256-wwpT+I5/zrln85BDzlZoEDC19GwYrcZSXbrJjyvC4jk=", 2971 "narHash": "sha256-zqcqc5uj5oyoCVQi/1+G3hjAuMvwAl6jNwIoHqPT+jk=",
2972 "path": "../../flakes/lib", 2972 "path": "../../flakes/lib",
2973 "type": "path" 2973 "type": "path"
2974 }, 2974 },
@@ -2987,7 +2987,7 @@
2987 }, 2987 },
2988 "locked": { 2988 "locked": {
2989 "lastModified": 1, 2989 "lastModified": 1,
2990 "narHash": "sha256-wwpT+I5/zrln85BDzlZoEDC19GwYrcZSXbrJjyvC4jk=", 2990 "narHash": "sha256-zqcqc5uj5oyoCVQi/1+G3hjAuMvwAl6jNwIoHqPT+jk=",
2991 "path": "../../flakes/lib", 2991 "path": "../../flakes/lib",
2992 "type": "path" 2992 "type": "path"
2993 }, 2993 },
@@ -3006,7 +3006,7 @@
3006 }, 3006 },
3007 "locked": { 3007 "locked": {
3008 "lastModified": 1, 3008 "lastModified": 1,
3009 "narHash": "sha256-wwpT+I5/zrln85BDzlZoEDC19GwYrcZSXbrJjyvC4jk=", 3009 "narHash": "sha256-zqcqc5uj5oyoCVQi/1+G3hjAuMvwAl6jNwIoHqPT+jk=",
3010 "path": "../../flakes/lib", 3010 "path": "../../flakes/lib",
3011 "type": "path" 3011 "type": "path"
3012 }, 3012 },
@@ -3025,7 +3025,7 @@
3025 }, 3025 },
3026 "locked": { 3026 "locked": {
3027 "lastModified": 1, 3027 "lastModified": 1,
3028 "narHash": "sha256-wwpT+I5/zrln85BDzlZoEDC19GwYrcZSXbrJjyvC4jk=", 3028 "narHash": "sha256-zqcqc5uj5oyoCVQi/1+G3hjAuMvwAl6jNwIoHqPT+jk=",
3029 "path": "../../flakes/lib", 3029 "path": "../../flakes/lib",
3030 "type": "path" 3030 "type": "path"
3031 }, 3031 },
@@ -3044,7 +3044,7 @@
3044 }, 3044 },
3045 "locked": { 3045 "locked": {
3046 "lastModified": 1, 3046 "lastModified": 1,
3047 "narHash": "sha256-wwpT+I5/zrln85BDzlZoEDC19GwYrcZSXbrJjyvC4jk=", 3047 "narHash": "sha256-zqcqc5uj5oyoCVQi/1+G3hjAuMvwAl6jNwIoHqPT+jk=",
3048 "path": "../../flakes/lib", 3048 "path": "../../flakes/lib",
3049 "type": "path" 3049 "type": "path"
3050 }, 3050 },
@@ -3063,7 +3063,7 @@
3063 }, 3063 },
3064 "locked": { 3064 "locked": {
3065 "lastModified": 1, 3065 "lastModified": 1,
3066 "narHash": "sha256-wwpT+I5/zrln85BDzlZoEDC19GwYrcZSXbrJjyvC4jk=", 3066 "narHash": "sha256-zqcqc5uj5oyoCVQi/1+G3hjAuMvwAl6jNwIoHqPT+jk=",
3067 "path": "../../flakes/lib", 3067 "path": "../../flakes/lib",
3068 "type": "path" 3068 "type": "path"
3069 }, 3069 },
@@ -3818,7 +3818,7 @@
3818 }, 3818 },
3819 "locked": { 3819 "locked": {
3820 "lastModified": 1, 3820 "lastModified": 1,
3821 "narHash": "sha256-6XWbafDuH63vuds7ZSaai1UO02xkhumDjT1oEioX7u0=", 3821 "narHash": "sha256-xN8yvmjHOfCoaSWpVilV/IKC0lqgYZRnSFaMRBLYl58=",
3822 "path": "../systems/backup-2", 3822 "path": "../systems/backup-2",
3823 "type": "path" 3823 "type": "path"
3824 }, 3824 },
@@ -3841,7 +3841,7 @@
3841 }, 3841 },
3842 "locked": { 3842 "locked": {
3843 "lastModified": 1, 3843 "lastModified": 1,
3844 "narHash": "sha256-Bt+EyQNXxATScgdFH69I1qR0n6J1BE3gy8l2iastAFo=", 3844 "narHash": "sha256-ipzZoGCU2LUEkl+cLGZLwLDvO+wUBC3vYFzFXzNwrvQ=",
3845 "path": "../systems/dilion", 3845 "path": "../systems/dilion",
3846 "type": "path" 3846 "type": "path"
3847 }, 3847 },
@@ -3890,7 +3890,7 @@
3890 }, 3890 },
3891 "locked": { 3891 "locked": {
3892 "lastModified": 1, 3892 "lastModified": 1,
3893 "narHash": "sha256-XI3Hd5sfsPp8/oiqiB5QIzRX8kM5RaJoEgBa41WdVpI=", 3893 "narHash": "sha256-ZYoGDNSwUgMTzKy83fXR4qyGF3WSeefBD72JIHEaq88=",
3894 "path": "../systems/eldiron", 3894 "path": "../systems/eldiron",
3895 "type": "path" 3895 "type": "path"
3896 }, 3896 },
@@ -3916,7 +3916,7 @@
3916 }, 3916 },
3917 "locked": { 3917 "locked": {
3918 "lastModified": 1, 3918 "lastModified": 1,
3919 "narHash": "sha256-jLfonpeyLVbLJ4mDHFZoBeNEg3t/yS7t0DMGH5lHlyI=", 3919 "narHash": "sha256-LhU9hBC6h+VdIOtHTaL1hRrmQRZd9eDPEdhJa0qLLmk=",
3920 "path": "../systems/monitoring-1", 3920 "path": "../systems/monitoring-1",
3921 "type": "path" 3921 "type": "path"
3922 }, 3922 },
@@ -3941,7 +3941,7 @@
3941 }, 3941 },
3942 "locked": { 3942 "locked": {
3943 "lastModified": 1, 3943 "lastModified": 1,
3944 "narHash": "sha256-iqBGLdwWzpRUVYjKQY0AKG32LbDkbpSxJibBIIGrAJg=", 3944 "narHash": "sha256-5W9ZiQAE6mdxfnhTnsdC+oZgUAaxTZjfnaHwSgowArI=",
3945 "path": "../systems/quatresaisons", 3945 "path": "../systems/quatresaisons",
3946 "type": "path" 3946 "type": "path"
3947 }, 3947 },
@@ -3962,7 +3962,7 @@
3962 }, 3962 },
3963 "locked": { 3963 "locked": {
3964 "lastModified": 1, 3964 "lastModified": 1,
3965 "narHash": "sha256-fefjcy/F/KPaDFOKzeA0DUDrDq1fIwmWT+6jtVqRR54=", 3965 "narHash": "sha256-H24t1Z6UUGjXF3dDgZeBSV+kNgWGVMAnJIK5BEbUxkw=",
3966 "path": "../systems/zoldene", 3966 "path": "../systems/zoldene",
3967 "type": "path" 3967 "type": "path"
3968 }, 3968 },
@@ -4043,6 +4043,166 @@
4043 "type": "path" 4043 "type": "path"
4044 } 4044 }
4045 }, 4045 },
4046 "nix-github-actions": {
4047 "inputs": {
4048 "nixpkgs": [
4049 "n-backup-2",
4050 "my-lib",
4051 "colmena",
4052 "nixpkgs"
4053 ]
4054 },
4055 "locked": {
4056 "lastModified": 1737420293,
4057 "narHash": "sha256-F1G5ifvqTpJq7fdkT34e/Jy9VCyzd5XfJ9TO8fHhJWE=",
4058 "owner": "nix-community",
4059 "repo": "nix-github-actions",
4060 "rev": "f4158fa080ef4503c8f4c820967d946c2af31ec9",
4061 "type": "github"
4062 },
4063 "original": {
4064 "owner": "nix-community",
4065 "repo": "nix-github-actions",
4066 "type": "github"
4067 }
4068 },
4069 "nix-github-actions_2": {
4070 "inputs": {
4071 "nixpkgs": [
4072 "n-dilion",
4073 "my-lib",
4074 "colmena",
4075 "nixpkgs"
4076 ]
4077 },
4078 "locked": {
4079 "lastModified": 1737420293,
4080 "narHash": "sha256-F1G5ifvqTpJq7fdkT34e/Jy9VCyzd5XfJ9TO8fHhJWE=",
4081 "owner": "nix-community",
4082 "repo": "nix-github-actions",
4083 "rev": "f4158fa080ef4503c8f4c820967d946c2af31ec9",
4084 "type": "github"
4085 },
4086 "original": {
4087 "owner": "nix-community",
4088 "repo": "nix-github-actions",
4089 "type": "github"
4090 }
4091 },
4092 "nix-github-actions_3": {
4093 "inputs": {
4094 "nixpkgs": [
4095 "n-eldiron",
4096 "my-lib",
4097 "colmena",
4098 "nixpkgs"
4099 ]
4100 },
4101 "locked": {
4102 "lastModified": 1737420293,
4103 "narHash": "sha256-F1G5ifvqTpJq7fdkT34e/Jy9VCyzd5XfJ9TO8fHhJWE=",
4104 "owner": "nix-community",
4105 "repo": "nix-github-actions",
4106 "rev": "f4158fa080ef4503c8f4c820967d946c2af31ec9",
4107 "type": "github"
4108 },
4109 "original": {
4110 "owner": "nix-community",
4111 "repo": "nix-github-actions",
4112 "type": "github"
4113 }
4114 },
4115 "nix-github-actions_4": {
4116 "inputs": {
4117 "nixpkgs": [
4118 "n-monitoring-1",
4119 "my-lib",
4120 "colmena",
4121 "nixpkgs"
4122 ]
4123 },
4124 "locked": {
4125 "lastModified": 1737420293,
4126 "narHash": "sha256-F1G5ifvqTpJq7fdkT34e/Jy9VCyzd5XfJ9TO8fHhJWE=",
4127 "owner": "nix-community",
4128 "repo": "nix-github-actions",
4129 "rev": "f4158fa080ef4503c8f4c820967d946c2af31ec9",
4130 "type": "github"
4131 },
4132 "original": {
4133 "owner": "nix-community",
4134 "repo": "nix-github-actions",
4135 "type": "github"
4136 }
4137 },
4138 "nix-github-actions_5": {
4139 "inputs": {
4140 "nixpkgs": [
4141 "n-quatresaisons",
4142 "my-lib",
4143 "colmena",
4144 "nixpkgs"
4145 ]
4146 },
4147 "locked": {
4148 "lastModified": 1737420293,
4149 "narHash": "sha256-F1G5ifvqTpJq7fdkT34e/Jy9VCyzd5XfJ9TO8fHhJWE=",
4150 "owner": "nix-community",
4151 "repo": "nix-github-actions",
4152 "rev": "f4158fa080ef4503c8f4c820967d946c2af31ec9",
4153 "type": "github"
4154 },
4155 "original": {
4156 "owner": "nix-community",
4157 "repo": "nix-github-actions",
4158 "type": "github"
4159 }
4160 },
4161 "nix-github-actions_6": {
4162 "inputs": {
4163 "nixpkgs": [
4164 "n-zoldene",
4165 "my-lib",
4166 "colmena",
4167 "nixpkgs"
4168 ]
4169 },
4170 "locked": {
4171 "lastModified": 1737420293,
4172 "narHash": "sha256-F1G5ifvqTpJq7fdkT34e/Jy9VCyzd5XfJ9TO8fHhJWE=",
4173 "owner": "nix-community",
4174 "repo": "nix-github-actions",
4175 "rev": "f4158fa080ef4503c8f4c820967d946c2af31ec9",
4176 "type": "github"
4177 },
4178 "original": {
4179 "owner": "nix-community",
4180 "repo": "nix-github-actions",
4181 "type": "github"
4182 }
4183 },
4184 "nix-github-actions_7": {
4185 "inputs": {
4186 "nixpkgs": [
4187 "s-lib",
4188 "colmena",
4189 "nixpkgs"
4190 ]
4191 },
4192 "locked": {
4193 "lastModified": 1737420293,
4194 "narHash": "sha256-F1G5ifvqTpJq7fdkT34e/Jy9VCyzd5XfJ9TO8fHhJWE=",
4195 "owner": "nix-community",
4196 "repo": "nix-github-actions",
4197 "rev": "f4158fa080ef4503c8f4c820967d946c2af31ec9",
4198 "type": "github"
4199 },
4200 "original": {
4201 "owner": "nix-community",
4202 "repo": "nix-github-actions",
4203 "type": "github"
4204 }
4205 },
4046 "nixos-2305": { 4206 "nixos-2305": {
4047 "locked": { 4207 "locked": {
4048 "lastModified": 1687938137, 4208 "lastModified": 1687938137,
@@ -8123,7 +8283,7 @@
8123 }, 8283 },
8124 "locked": { 8284 "locked": {
8125 "lastModified": 1, 8285 "lastModified": 1,
8126 "narHash": "sha256-wwpT+I5/zrln85BDzlZoEDC19GwYrcZSXbrJjyvC4jk=", 8286 "narHash": "sha256-zqcqc5uj5oyoCVQi/1+G3hjAuMvwAl6jNwIoHqPT+jk=",
8127 "path": "./lib", 8287 "path": "./lib",
8128 "type": "path" 8288 "type": "path"
8129 }, 8289 },
@@ -9027,112 +9187,112 @@
9027 }, 9187 },
9028 "stable": { 9188 "stable": {
9029 "locked": { 9189 "locked": {
9030 "lastModified": 1669735802, 9190 "lastModified": 1735563628,
9031 "narHash": "sha256-qtG/o/i5ZWZLmXw108N2aPiVsxOcidpHJYNkT45ry9Q=", 9191 "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=",
9032 "owner": "NixOS", 9192 "owner": "NixOS",
9033 "repo": "nixpkgs", 9193 "repo": "nixpkgs",
9034 "rev": "731cc710aeebecbf45a258e977e8b68350549522", 9194 "rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798",
9035 "type": "github" 9195 "type": "github"
9036 }, 9196 },
9037 "original": { 9197 "original": {
9038 "owner": "NixOS", 9198 "owner": "NixOS",
9039 "ref": "nixos-22.11", 9199 "ref": "nixos-24.05",
9040 "repo": "nixpkgs", 9200 "repo": "nixpkgs",
9041 "type": "github" 9201 "type": "github"
9042 } 9202 }
9043 }, 9203 },
9044 "stable_2": { 9204 "stable_2": {
9045 "locked": { 9205 "locked": {
9046 "lastModified": 1669735802, 9206 "lastModified": 1735563628,
9047 "narHash": "sha256-qtG/o/i5ZWZLmXw108N2aPiVsxOcidpHJYNkT45ry9Q=", 9207 "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=",
9048 "owner": "NixOS", 9208 "owner": "NixOS",
9049 "repo": "nixpkgs", 9209 "repo": "nixpkgs",
9050 "rev": "731cc710aeebecbf45a258e977e8b68350549522", 9210 "rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798",
9051 "type": "github" 9211 "type": "github"
9052 }, 9212 },
9053 "original": { 9213 "original": {
9054 "owner": "NixOS", 9214 "owner": "NixOS",
9055 "ref": "nixos-22.11", 9215 "ref": "nixos-24.05",
9056 "repo": "nixpkgs", 9216 "repo": "nixpkgs",
9057 "type": "github" 9217 "type": "github"
9058 } 9218 }
9059 }, 9219 },
9060 "stable_3": { 9220 "stable_3": {
9061 "locked": { 9221 "locked": {
9062 "lastModified": 1669735802, 9222 "lastModified": 1735563628,
9063 "narHash": "sha256-qtG/o/i5ZWZLmXw108N2aPiVsxOcidpHJYNkT45ry9Q=", 9223 "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=",
9064 "owner": "NixOS", 9224 "owner": "NixOS",
9065 "repo": "nixpkgs", 9225 "repo": "nixpkgs",
9066 "rev": "731cc710aeebecbf45a258e977e8b68350549522", 9226 "rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798",
9067 "type": "github" 9227 "type": "github"
9068 }, 9228 },
9069 "original": { 9229 "original": {
9070 "owner": "NixOS", 9230 "owner": "NixOS",
9071 "ref": "nixos-22.11", 9231 "ref": "nixos-24.05",
9072 "repo": "nixpkgs", 9232 "repo": "nixpkgs",
9073 "type": "github" 9233 "type": "github"
9074 } 9234 }
9075 }, 9235 },
9076 "stable_4": { 9236 "stable_4": {
9077 "locked": { 9237 "locked": {
9078 "lastModified": 1669735802, 9238 "lastModified": 1735563628,
9079 "narHash": "sha256-qtG/o/i5ZWZLmXw108N2aPiVsxOcidpHJYNkT45ry9Q=", 9239 "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=",
9080 "owner": "NixOS", 9240 "owner": "NixOS",
9081 "repo": "nixpkgs", 9241 "repo": "nixpkgs",
9082 "rev": "731cc710aeebecbf45a258e977e8b68350549522", 9242 "rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798",
9083 "type": "github" 9243 "type": "github"
9084 }, 9244 },
9085 "original": { 9245 "original": {
9086 "owner": "NixOS", 9246 "owner": "NixOS",
9087 "ref": "nixos-22.11", 9247 "ref": "nixos-24.05",
9088 "repo": "nixpkgs", 9248 "repo": "nixpkgs",
9089 "type": "github" 9249 "type": "github"
9090 } 9250 }
9091 }, 9251 },
9092 "stable_5": { 9252 "stable_5": {
9093 "locked": { 9253 "locked": {
9094 "lastModified": 1669735802, 9254 "lastModified": 1735563628,
9095 "narHash": "sha256-qtG/o/i5ZWZLmXw108N2aPiVsxOcidpHJYNkT45ry9Q=", 9255 "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=",
9096 "owner": "NixOS", 9256 "owner": "NixOS",
9097 "repo": "nixpkgs", 9257 "repo": "nixpkgs",
9098 "rev": "731cc710aeebecbf45a258e977e8b68350549522", 9258 "rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798",
9099 "type": "github" 9259 "type": "github"
9100 }, 9260 },
9101 "original": { 9261 "original": {
9102 "owner": "NixOS", 9262 "owner": "NixOS",
9103 "ref": "nixos-22.11", 9263 "ref": "nixos-24.05",
9104 "repo": "nixpkgs", 9264 "repo": "nixpkgs",
9105 "type": "github" 9265 "type": "github"
9106 } 9266 }
9107 }, 9267 },
9108 "stable_6": { 9268 "stable_6": {
9109 "locked": { 9269 "locked": {
9110 "lastModified": 1669735802, 9270 "lastModified": 1735563628,
9111 "narHash": "sha256-qtG/o/i5ZWZLmXw108N2aPiVsxOcidpHJYNkT45ry9Q=", 9271 "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=",
9112 "owner": "NixOS", 9272 "owner": "NixOS",
9113 "repo": "nixpkgs", 9273 "repo": "nixpkgs",
9114 "rev": "731cc710aeebecbf45a258e977e8b68350549522", 9274 "rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798",
9115 "type": "github" 9275 "type": "github"
9116 }, 9276 },
9117 "original": { 9277 "original": {
9118 "owner": "NixOS", 9278 "owner": "NixOS",
9119 "ref": "nixos-22.11", 9279 "ref": "nixos-24.05",
9120 "repo": "nixpkgs", 9280 "repo": "nixpkgs",
9121 "type": "github" 9281 "type": "github"
9122 } 9282 }
9123 }, 9283 },
9124 "stable_7": { 9284 "stable_7": {
9125 "locked": { 9285 "locked": {
9126 "lastModified": 1669735802, 9286 "lastModified": 1735563628,
9127 "narHash": "sha256-qtG/o/i5ZWZLmXw108N2aPiVsxOcidpHJYNkT45ry9Q=", 9287 "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=",
9128 "owner": "NixOS", 9288 "owner": "NixOS",
9129 "repo": "nixpkgs", 9289 "repo": "nixpkgs",
9130 "rev": "731cc710aeebecbf45a258e977e8b68350549522", 9290 "rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798",
9131 "type": "github" 9291 "type": "github"
9132 }, 9292 },
9133 "original": { 9293 "original": {
9134 "owner": "NixOS", 9294 "owner": "NixOS",
9135 "ref": "nixos-22.11", 9295 "ref": "nixos-24.05",
9136 "repo": "nixpkgs", 9296 "repo": "nixpkgs",
9137 "type": "github" 9297 "type": "github"
9138 } 9298 }
diff --git a/flakes/lib/flake.lock b/flakes/lib/flake.lock
index 3ca158e..ca5d027 100644
--- a/flakes/lib/flake.lock
+++ b/flakes/lib/flake.lock
@@ -4,20 +4,20 @@
4 "inputs": { 4 "inputs": {
5 "flake-compat": "flake-compat", 5 "flake-compat": "flake-compat",
6 "flake-utils": "flake-utils", 6 "flake-utils": "flake-utils",
7 "nix-github-actions": "nix-github-actions",
7 "nixpkgs": "nixpkgs", 8 "nixpkgs": "nixpkgs",
8 "stable": "stable" 9 "stable": "stable"
9 }, 10 },
10 "locked": { 11 "locked": {
11 "lastModified": 1687954574, 12 "lastModified": 1739900653,
12 "narHash": "sha256-YasVTaNXq2xqZdejyIhuyqvNypmx+K/Y1ZZ4+raeeII=", 13 "narHash": "sha256-hPSLvw6AZQYrZyGI6Uq4XgST7benF/0zcCpugn/P0yM=",
13 "owner": "immae", 14 "owner": "zhaofengli",
14 "repo": "colmena", 15 "repo": "colmena",
15 "rev": "e427171150a35e23204c4c15a2483358d22a0eff", 16 "rev": "2370d4336eda2a9ef29fce10fa7076ae011983ab",
16 "type": "github" 17 "type": "github"
17 }, 18 },
18 "original": { 19 "original": {
19 "owner": "immae", 20 "owner": "zhaofengli",
20 "ref": "add-lib-get-flake",
21 "repo": "colmena", 21 "repo": "colmena",
22 "type": "github" 22 "type": "github"
23 } 23 }
@@ -89,6 +89,27 @@
89 "type": "github" 89 "type": "github"
90 } 90 }
91 }, 91 },
92 "nix-github-actions": {
93 "inputs": {
94 "nixpkgs": [
95 "colmena",
96 "nixpkgs"
97 ]
98 },
99 "locked": {
100 "lastModified": 1737420293,
101 "narHash": "sha256-F1G5ifvqTpJq7fdkT34e/Jy9VCyzd5XfJ9TO8fHhJWE=",
102 "owner": "nix-community",
103 "repo": "nix-github-actions",
104 "rev": "f4158fa080ef4503c8f4c820967d946c2af31ec9",
105 "type": "github"
106 },
107 "original": {
108 "owner": "nix-community",
109 "repo": "nix-github-actions",
110 "type": "github"
111 }
112 },
92 "nixos-2305": { 113 "nixos-2305": {
93 "locked": { 114 "locked": {
94 "lastModified": 1687938137, 115 "lastModified": 1687938137,
@@ -249,16 +270,16 @@
249 }, 270 },
250 "stable": { 271 "stable": {
251 "locked": { 272 "locked": {
252 "lastModified": 1669735802, 273 "lastModified": 1735563628,
253 "narHash": "sha256-qtG/o/i5ZWZLmXw108N2aPiVsxOcidpHJYNkT45ry9Q=", 274 "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=",
254 "owner": "NixOS", 275 "owner": "NixOS",
255 "repo": "nixpkgs", 276 "repo": "nixpkgs",
256 "rev": "731cc710aeebecbf45a258e977e8b68350549522", 277 "rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798",
257 "type": "github" 278 "type": "github"
258 }, 279 },
259 "original": { 280 "original": {
260 "owner": "NixOS", 281 "owner": "NixOS",
261 "ref": "nixos-22.11", 282 "ref": "nixos-24.05",
262 "repo": "nixpkgs", 283 "repo": "nixpkgs",
263 "type": "github" 284 "type": "github"
264 } 285 }
diff --git a/flakes/lib/flake.nix b/flakes/lib/flake.nix
index 5b78fb6..b5bd7ee 100644
--- a/flakes/lib/flake.nix
+++ b/flakes/lib/flake.nix
@@ -2,8 +2,7 @@
2 inputs.nixpkgs.url = "github:NixOS/nixpkgs"; 2 inputs.nixpkgs.url = "github:NixOS/nixpkgs";
3 inputs.flake-parts.url = "github:hercules-ci/flake-parts"; 3 inputs.flake-parts.url = "github:hercules-ci/flake-parts";
4 inputs.disko.url = "github:nix-community/disko"; 4 inputs.disko.url = "github:nix-community/disko";
5 # replace with zhaofengli/colmena once https://github.com/zhaofengli/colmena/pull/161 is merged 5 inputs.colmena.url = "github:zhaofengli/colmena";
6 inputs.colmena.url = "github:immae/colmena/add-lib-get-flake";
7 inputs.nixos-anywhere.url = "github:numtide/nixos-anywhere"; 6 inputs.nixos-anywhere.url = "github:numtide/nixos-anywhere";
8 inputs.nixos-anywhere.inputs.disko.follows = "disko"; 7 inputs.nixos-anywhere.inputs.disko.follows = "disko";
9 inputs.nixos-anywhere.inputs.flake-parts.follows = "flake-parts"; 8 inputs.nixos-anywhere.inputs.flake-parts.follows = "flake-parts";
@@ -45,11 +44,11 @@
45 44
46 }; 45 };
47 flake = { 46 flake = {
48 nixosConfigurations.${name} = (colmena.lib.fromRawFlake self).nodes.${name}; 47 nixosConfigurations.${name} = (colmena.lib.makeHive self.outputs.colmena).nodes.${name};
49 nixosConfigurations."${name}WithEncryption" = let 48 nixosConfigurations."${name}WithEncryption" = let
50 selfWithEncryption = nixpkgs.lib.recursiveUpdate self { outputs.colmena.meta.specialArgs.cryptKeyFile = "/run/decrypt-key"; }; 49 selfWithEncryption = nixpkgs.lib.recursiveUpdate self { outputs.colmena.meta.specialArgs.cryptKeyFile = "/run/decrypt-key"; };
51 in 50 in
52 (colmena.lib.fromRawFlake selfWithEncryption).nodes.${name}; 51 (colmena.lib.makeHive selfWithEncryption.outputs.colmena).nodes.${name};
53 colmena = { 52 colmena = {
54 meta.nixpkgs = nixpkgs.legacyPackages.${system}; 53 meta.nixpkgs = nixpkgs.legacyPackages.${system};
55 meta.specialArgs = moduleArgs; 54 meta.specialArgs = moduleArgs;