aboutsummaryrefslogtreecommitdiff
path: root/systems
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2024-02-24 12:04:34 +0100
committerIsmaël Bouya <ismael.bouya@normalesup.org>2024-02-24 12:29:42 +0100
commit5707d6961bbd68c2ab51eaaa790435546f714037 (patch)
tree3e64def6f002655c520cc8ce4a88d915fdc372f1 /systems
parentc9898979c966e6cd029a6e64e58dc3e01bec85a5 (diff)
downloadNix-5707d6961bbd68c2ab51eaaa790435546f714037.tar.gz
Nix-5707d6961bbd68c2ab51eaaa790435546f714037.tar.zst
Nix-5707d6961bbd68c2ab51eaaa790435546f714037.zip
Bump Zoldene version
Diffstat (limited to 'systems')
-rw-r--r--systems/backup-2/flake.lock4
-rw-r--r--systems/dilion/flake.lock4
-rw-r--r--systems/eldiron/flake.lock18
-rw-r--r--systems/monitoring-1/flake.lock4
-rw-r--r--systems/quatresaisons/flake.lock4
-rw-r--r--systems/zoldene/base.nix10
-rw-r--r--systems/zoldene/flake.lock12
-rw-r--r--systems/zoldene/logging.nix2
8 files changed, 34 insertions, 24 deletions
diff --git a/systems/backup-2/flake.lock b/systems/backup-2/flake.lock
index e291442..e2d633b 100644
--- a/systems/backup-2/flake.lock
+++ b/systems/backup-2/flake.lock
@@ -425,7 +425,7 @@
425 }, 425 },
426 "locked": { 426 "locked": {
427 "lastModified": 1, 427 "lastModified": 1,
428 "narHash": "sha256-LcNrlKExlzjo4XK3+80rONNOvx7BxUYh46rbHPTZ0W4=", 428 "narHash": "sha256-LB6s98L2OEDG6p79qlbp0OeMJ0t89qGaIjXSQyaLjpk=",
429 "path": "../../mypackages", 429 "path": "../../mypackages",
430 "type": "path" 430 "type": "path"
431 }, 431 },
@@ -1104,7 +1104,7 @@
1104 }, 1104 },
1105 "locked": { 1105 "locked": {
1106 "lastModified": 1, 1106 "lastModified": 1,
1107 "narHash": "sha256-kYdljzySZwf9miB2mMHz8SsQHjVTkwuQ2oYNkijYyII=", 1107 "narHash": "sha256-a+XNRoZjx2k5uyAFCF/4OKxF3XUwxf+ECZJvnIphrEs=",
1108 "path": "../../flakes/private/system", 1108 "path": "../../flakes/private/system",
1109 "type": "path" 1109 "type": "path"
1110 }, 1110 },
diff --git a/systems/dilion/flake.lock b/systems/dilion/flake.lock
index 93287ab..16e1192 100644
--- a/systems/dilion/flake.lock
+++ b/systems/dilion/flake.lock
@@ -243,7 +243,7 @@
243 }, 243 },
244 "locked": { 244 "locked": {
245 "lastModified": 1, 245 "lastModified": 1,
246 "narHash": "sha256-LcNrlKExlzjo4XK3+80rONNOvx7BxUYh46rbHPTZ0W4=", 246 "narHash": "sha256-LB6s98L2OEDG6p79qlbp0OeMJ0t89qGaIjXSQyaLjpk=",
247 "path": "../../mypackages", 247 "path": "../../mypackages",
248 "type": "path" 248 "type": "path"
249 }, 249 },
@@ -599,7 +599,7 @@
599 }, 599 },
600 "locked": { 600 "locked": {
601 "lastModified": 1, 601 "lastModified": 1,
602 "narHash": "sha256-kYdljzySZwf9miB2mMHz8SsQHjVTkwuQ2oYNkijYyII=", 602 "narHash": "sha256-a+XNRoZjx2k5uyAFCF/4OKxF3XUwxf+ECZJvnIphrEs=",
603 "path": "../../flakes/private/system", 603 "path": "../../flakes/private/system",
604 "type": "path" 604 "type": "path"
605 }, 605 },
diff --git a/systems/eldiron/flake.lock b/systems/eldiron/flake.lock
index ee279c5..f33d72b 100644
--- a/systems/eldiron/flake.lock
+++ b/systems/eldiron/flake.lock
@@ -813,7 +813,7 @@
813 }, 813 },
814 "locked": { 814 "locked": {
815 "lastModified": 1, 815 "lastModified": 1,
816 "narHash": "sha256-LcNrlKExlzjo4XK3+80rONNOvx7BxUYh46rbHPTZ0W4=", 816 "narHash": "sha256-LB6s98L2OEDG6p79qlbp0OeMJ0t89qGaIjXSQyaLjpk=",
817 "path": "../../mypackages", 817 "path": "../../mypackages",
818 "type": "path" 818 "type": "path"
819 }, 819 },
@@ -830,7 +830,7 @@
830 }, 830 },
831 "locked": { 831 "locked": {
832 "lastModified": 1, 832 "lastModified": 1,
833 "narHash": "sha256-LcNrlKExlzjo4XK3+80rONNOvx7BxUYh46rbHPTZ0W4=", 833 "narHash": "sha256-LB6s98L2OEDG6p79qlbp0OeMJ0t89qGaIjXSQyaLjpk=",
834 "path": "../mypackages", 834 "path": "../mypackages",
835 "type": "path" 835 "type": "path"
836 }, 836 },
@@ -847,7 +847,7 @@
847 }, 847 },
848 "locked": { 848 "locked": {
849 "lastModified": 1, 849 "lastModified": 1,
850 "narHash": "sha256-LcNrlKExlzjo4XK3+80rONNOvx7BxUYh46rbHPTZ0W4=", 850 "narHash": "sha256-LB6s98L2OEDG6p79qlbp0OeMJ0t89qGaIjXSQyaLjpk=",
851 "path": "../mypackages", 851 "path": "../mypackages",
852 "type": "path" 852 "type": "path"
853 }, 853 },
@@ -864,7 +864,7 @@
864 }, 864 },
865 "locked": { 865 "locked": {
866 "lastModified": 1, 866 "lastModified": 1,
867 "narHash": "sha256-LcNrlKExlzjo4XK3+80rONNOvx7BxUYh46rbHPTZ0W4=", 867 "narHash": "sha256-LB6s98L2OEDG6p79qlbp0OeMJ0t89qGaIjXSQyaLjpk=",
868 "path": "../mypackages", 868 "path": "../mypackages",
869 "type": "path" 869 "type": "path"
870 }, 870 },
@@ -2153,7 +2153,7 @@
2153 }, 2153 },
2154 "locked": { 2154 "locked": {
2155 "lastModified": 1, 2155 "lastModified": 1,
2156 "narHash": "sha256-kYdljzySZwf9miB2mMHz8SsQHjVTkwuQ2oYNkijYyII=", 2156 "narHash": "sha256-a+XNRoZjx2k5uyAFCF/4OKxF3XUwxf+ECZJvnIphrEs=",
2157 "path": "../../flakes/private/system", 2157 "path": "../../flakes/private/system",
2158 "type": "path" 2158 "type": "path"
2159 }, 2159 },
@@ -2206,7 +2206,7 @@
2206 }, 2206 },
2207 "locked": { 2207 "locked": {
2208 "lastModified": 1, 2208 "lastModified": 1,
2209 "narHash": "sha256-Wt3xfm8KNHMi14Dgis5Rh7fuAGwt5FTvZxRmynuaxhA=", 2209 "narHash": "sha256-TY7xhDa/htWaMqdVrR9FuDuF/Qpur/tbyItGiaa4Bfc=",
2210 "path": "../../flakes/etherpad-lite", 2210 "path": "../../flakes/etherpad-lite",
2211 "type": "path" 2211 "type": "path"
2212 }, 2212 },
@@ -2248,7 +2248,7 @@
2248 }, 2248 },
2249 "locked": { 2249 "locked": {
2250 "lastModified": 1, 2250 "lastModified": 1,
2251 "narHash": "sha256-KmjwOUD6Z4Zu/uF77P8lRROnEzCY3/e3y0k3gzOfpGs=", 2251 "narHash": "sha256-5sQ5m5pO1gjPFnArYeU/dXFVnc6rZQDu2kuSzSe0wlo=",
2252 "path": "../../flakes/grocy", 2252 "path": "../../flakes/grocy",
2253 "type": "path" 2253 "type": "path"
2254 }, 2254 },
@@ -2329,7 +2329,7 @@
2329 }, 2329 },
2330 "locked": { 2330 "locked": {
2331 "lastModified": 1, 2331 "lastModified": 1,
2332 "narHash": "sha256-LcNrlKExlzjo4XK3+80rONNOvx7BxUYh46rbHPTZ0W4=", 2332 "narHash": "sha256-LB6s98L2OEDG6p79qlbp0OeMJ0t89qGaIjXSQyaLjpk=",
2333 "path": "../../flakes/mypackages", 2333 "path": "../../flakes/mypackages",
2334 "type": "path" 2334 "type": "path"
2335 }, 2335 },
@@ -2440,7 +2440,7 @@
2440 }, 2440 },
2441 "locked": { 2441 "locked": {
2442 "lastModified": 1, 2442 "lastModified": 1,
2443 "narHash": "sha256-eHQbOu6qaTNN/2AFUT+bVGsQOzRowKdoRIgOwVZmSGI=", 2443 "narHash": "sha256-XUfcpd5m6smfhWOG4ICxAanwpTollGBI0/zNPh6BHAE=",
2444 "path": "../../flakes/surfer", 2444 "path": "../../flakes/surfer",
2445 "type": "path" 2445 "type": "path"
2446 }, 2446 },
diff --git a/systems/monitoring-1/flake.lock b/systems/monitoring-1/flake.lock
index ea7ce5b..89e0435 100644
--- a/systems/monitoring-1/flake.lock
+++ b/systems/monitoring-1/flake.lock
@@ -313,7 +313,7 @@
313 }, 313 },
314 "locked": { 314 "locked": {
315 "lastModified": 1, 315 "lastModified": 1,
316 "narHash": "sha256-LcNrlKExlzjo4XK3+80rONNOvx7BxUYh46rbHPTZ0W4=", 316 "narHash": "sha256-LB6s98L2OEDG6p79qlbp0OeMJ0t89qGaIjXSQyaLjpk=",
317 "path": "../../mypackages", 317 "path": "../../mypackages",
318 "type": "path" 318 "type": "path"
319 }, 319 },
@@ -735,7 +735,7 @@
735 }, 735 },
736 "locked": { 736 "locked": {
737 "lastModified": 1, 737 "lastModified": 1,
738 "narHash": "sha256-kYdljzySZwf9miB2mMHz8SsQHjVTkwuQ2oYNkijYyII=", 738 "narHash": "sha256-a+XNRoZjx2k5uyAFCF/4OKxF3XUwxf+ECZJvnIphrEs=",
739 "path": "../../flakes/private/system", 739 "path": "../../flakes/private/system",
740 "type": "path" 740 "type": "path"
741 }, 741 },
diff --git a/systems/quatresaisons/flake.lock b/systems/quatresaisons/flake.lock
index 2b05f58..1d2435d 100644
--- a/systems/quatresaisons/flake.lock
+++ b/systems/quatresaisons/flake.lock
@@ -291,7 +291,7 @@
291 }, 291 },
292 "locked": { 292 "locked": {
293 "lastModified": 1, 293 "lastModified": 1,
294 "narHash": "sha256-LcNrlKExlzjo4XK3+80rONNOvx7BxUYh46rbHPTZ0W4=", 294 "narHash": "sha256-LB6s98L2OEDG6p79qlbp0OeMJ0t89qGaIjXSQyaLjpk=",
295 "path": "../../mypackages", 295 "path": "../../mypackages",
296 "type": "path" 296 "type": "path"
297 }, 297 },
@@ -712,7 +712,7 @@
712 }, 712 },
713 "locked": { 713 "locked": {
714 "lastModified": 1, 714 "lastModified": 1,
715 "narHash": "sha256-kYdljzySZwf9miB2mMHz8SsQHjVTkwuQ2oYNkijYyII=", 715 "narHash": "sha256-a+XNRoZjx2k5uyAFCF/4OKxF3XUwxf+ECZJvnIphrEs=",
716 "path": "../../flakes/private/system", 716 "path": "../../flakes/private/system",
717 "type": "path" 717 "type": "path"
718 }, 718 },
diff --git a/systems/zoldene/base.nix b/systems/zoldene/base.nix
index 2c0a461..2751d63 100644
--- a/systems/zoldene/base.nix
+++ b/systems/zoldene/base.nix
@@ -126,5 +126,15 @@ in
126 # ssh-keyscan zoldene | nix-shell -p ssh-to-age --run ssh-to-age 126 # ssh-keyscan zoldene | nix-shell -p ssh-to-age --run ssh-to-age
127 secrets.ageKeys = [ "age1rqr7qdpjm8fy9nf3x07fa824v87n40g0ljrgdysuayuklnvhcynq4c8en8" ]; 127 secrets.ageKeys = [ "age1rqr7qdpjm8fy9nf3x07fa824v87n40g0ljrgdysuayuklnvhcynq4c8en8" ];
128 128
129 system.activationScripts.wrappers = {
130 text = ''
131 # wrappers was migrated to systemd, which happens before activation
132 '';
133 };
129 134
135 nixpkgs.overlays = [
136 (self: super: {
137 postgresql_system = self.postgresql_16;
138 })
139 ];
130} 140}
diff --git a/systems/zoldene/flake.lock b/systems/zoldene/flake.lock
index 1baa6c1..8510f56 100644
--- a/systems/zoldene/flake.lock
+++ b/systems/zoldene/flake.lock
@@ -193,7 +193,7 @@
193 }, 193 },
194 "locked": { 194 "locked": {
195 "lastModified": 1, 195 "lastModified": 1,
196 "narHash": "sha256-LcNrlKExlzjo4XK3+80rONNOvx7BxUYh46rbHPTZ0W4=", 196 "narHash": "sha256-LB6s98L2OEDG6p79qlbp0OeMJ0t89qGaIjXSQyaLjpk=",
197 "path": "../../mypackages", 197 "path": "../../mypackages",
198 "type": "path" 198 "type": "path"
199 }, 199 },
@@ -387,11 +387,11 @@
387 }, 387 },
388 "nixpkgs_5": { 388 "nixpkgs_5": {
389 "locked": { 389 "locked": {
390 "lastModified": 1693158576, 390 "lastModified": 1708475490,
391 "narHash": "sha256-aRTTXkYvhXosGx535iAFUaoFboUrZSYb1Ooih/auGp0=", 391 "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=",
392 "owner": "nixos", 392 "owner": "NixOS",
393 "repo": "nixpkgs", 393 "repo": "nixpkgs",
394 "rev": "a999c1cc0c9eb2095729d5aa03e0d8f7ed256780", 394 "rev": "0e74ca98a74bc7270d28838369593635a5db3260",
395 "type": "github" 395 "type": "github"
396 }, 396 },
397 "original": { 397 "original": {
@@ -455,7 +455,7 @@
455 }, 455 },
456 "locked": { 456 "locked": {
457 "lastModified": 1, 457 "lastModified": 1,
458 "narHash": "sha256-kYdljzySZwf9miB2mMHz8SsQHjVTkwuQ2oYNkijYyII=", 458 "narHash": "sha256-a+XNRoZjx2k5uyAFCF/4OKxF3XUwxf+ECZJvnIphrEs=",
459 "path": "../../flakes/private/system", 459 "path": "../../flakes/private/system",
460 "type": "path" 460 "type": "path"
461 }, 461 },
diff --git a/systems/zoldene/logging.nix b/systems/zoldene/logging.nix
index 09ee104..b5f1e16 100644
--- a/systems/zoldene/logging.nix
+++ b/systems/zoldene/logging.nix
@@ -117,7 +117,7 @@ in
117 ensureUsers = [ 117 ensureUsers = [
118 { 118 {
119 name = "fluentbit"; 119 name = "fluentbit";
120 ensurePermissions."DATABASE \"fluentbit\"" = "ALL PRIVILEGES"; 120 ensureDBOwnership = true;
121 } 121 }
122 ]; 122 ];
123 }; 123 };