From 5707d6961bbd68c2ab51eaaa790435546f714037 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Sat, 24 Feb 2024 12:04:34 +0100 Subject: Bump Zoldene version --- systems/backup-2/flake.lock | 4 ++-- systems/dilion/flake.lock | 4 ++-- systems/eldiron/flake.lock | 18 +++++++++--------- systems/monitoring-1/flake.lock | 4 ++-- systems/quatresaisons/flake.lock | 4 ++-- systems/zoldene/base.nix | 10 ++++++++++ systems/zoldene/flake.lock | 12 ++++++------ systems/zoldene/logging.nix | 2 +- 8 files changed, 34 insertions(+), 24 deletions(-) (limited to 'systems') 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 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-LcNrlKExlzjo4XK3+80rONNOvx7BxUYh46rbHPTZ0W4=", + "narHash": "sha256-LB6s98L2OEDG6p79qlbp0OeMJ0t89qGaIjXSQyaLjpk=", "path": "../../mypackages", "type": "path" }, @@ -1104,7 +1104,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-kYdljzySZwf9miB2mMHz8SsQHjVTkwuQ2oYNkijYyII=", + "narHash": "sha256-a+XNRoZjx2k5uyAFCF/4OKxF3XUwxf+ECZJvnIphrEs=", "path": "../../flakes/private/system", "type": "path" }, 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 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-LcNrlKExlzjo4XK3+80rONNOvx7BxUYh46rbHPTZ0W4=", + "narHash": "sha256-LB6s98L2OEDG6p79qlbp0OeMJ0t89qGaIjXSQyaLjpk=", "path": "../../mypackages", "type": "path" }, @@ -599,7 +599,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-kYdljzySZwf9miB2mMHz8SsQHjVTkwuQ2oYNkijYyII=", + "narHash": "sha256-a+XNRoZjx2k5uyAFCF/4OKxF3XUwxf+ECZJvnIphrEs=", "path": "../../flakes/private/system", "type": "path" }, 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 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-LcNrlKExlzjo4XK3+80rONNOvx7BxUYh46rbHPTZ0W4=", + "narHash": "sha256-LB6s98L2OEDG6p79qlbp0OeMJ0t89qGaIjXSQyaLjpk=", "path": "../../mypackages", "type": "path" }, @@ -830,7 +830,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-LcNrlKExlzjo4XK3+80rONNOvx7BxUYh46rbHPTZ0W4=", + "narHash": "sha256-LB6s98L2OEDG6p79qlbp0OeMJ0t89qGaIjXSQyaLjpk=", "path": "../mypackages", "type": "path" }, @@ -847,7 +847,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-LcNrlKExlzjo4XK3+80rONNOvx7BxUYh46rbHPTZ0W4=", + "narHash": "sha256-LB6s98L2OEDG6p79qlbp0OeMJ0t89qGaIjXSQyaLjpk=", "path": "../mypackages", "type": "path" }, @@ -864,7 +864,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-LcNrlKExlzjo4XK3+80rONNOvx7BxUYh46rbHPTZ0W4=", + "narHash": "sha256-LB6s98L2OEDG6p79qlbp0OeMJ0t89qGaIjXSQyaLjpk=", "path": "../mypackages", "type": "path" }, @@ -2153,7 +2153,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-kYdljzySZwf9miB2mMHz8SsQHjVTkwuQ2oYNkijYyII=", + "narHash": "sha256-a+XNRoZjx2k5uyAFCF/4OKxF3XUwxf+ECZJvnIphrEs=", "path": "../../flakes/private/system", "type": "path" }, @@ -2206,7 +2206,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-Wt3xfm8KNHMi14Dgis5Rh7fuAGwt5FTvZxRmynuaxhA=", + "narHash": "sha256-TY7xhDa/htWaMqdVrR9FuDuF/Qpur/tbyItGiaa4Bfc=", "path": "../../flakes/etherpad-lite", "type": "path" }, @@ -2248,7 +2248,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-KmjwOUD6Z4Zu/uF77P8lRROnEzCY3/e3y0k3gzOfpGs=", + "narHash": "sha256-5sQ5m5pO1gjPFnArYeU/dXFVnc6rZQDu2kuSzSe0wlo=", "path": "../../flakes/grocy", "type": "path" }, @@ -2329,7 +2329,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-LcNrlKExlzjo4XK3+80rONNOvx7BxUYh46rbHPTZ0W4=", + "narHash": "sha256-LB6s98L2OEDG6p79qlbp0OeMJ0t89qGaIjXSQyaLjpk=", "path": "../../flakes/mypackages", "type": "path" }, @@ -2440,7 +2440,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-eHQbOu6qaTNN/2AFUT+bVGsQOzRowKdoRIgOwVZmSGI=", + "narHash": "sha256-XUfcpd5m6smfhWOG4ICxAanwpTollGBI0/zNPh6BHAE=", "path": "../../flakes/surfer", "type": "path" }, 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 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-LcNrlKExlzjo4XK3+80rONNOvx7BxUYh46rbHPTZ0W4=", + "narHash": "sha256-LB6s98L2OEDG6p79qlbp0OeMJ0t89qGaIjXSQyaLjpk=", "path": "../../mypackages", "type": "path" }, @@ -735,7 +735,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-kYdljzySZwf9miB2mMHz8SsQHjVTkwuQ2oYNkijYyII=", + "narHash": "sha256-a+XNRoZjx2k5uyAFCF/4OKxF3XUwxf+ECZJvnIphrEs=", "path": "../../flakes/private/system", "type": "path" }, 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 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-LcNrlKExlzjo4XK3+80rONNOvx7BxUYh46rbHPTZ0W4=", + "narHash": "sha256-LB6s98L2OEDG6p79qlbp0OeMJ0t89qGaIjXSQyaLjpk=", "path": "../../mypackages", "type": "path" }, @@ -712,7 +712,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-kYdljzySZwf9miB2mMHz8SsQHjVTkwuQ2oYNkijYyII=", + "narHash": "sha256-a+XNRoZjx2k5uyAFCF/4OKxF3XUwxf+ECZJvnIphrEs=", "path": "../../flakes/private/system", "type": "path" }, 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 # ssh-keyscan zoldene | nix-shell -p ssh-to-age --run ssh-to-age secrets.ageKeys = [ "age1rqr7qdpjm8fy9nf3x07fa824v87n40g0ljrgdysuayuklnvhcynq4c8en8" ]; + system.activationScripts.wrappers = { + text = '' + # wrappers was migrated to systemd, which happens before activation + ''; + }; + nixpkgs.overlays = [ + (self: super: { + postgresql_system = self.postgresql_16; + }) + ]; } 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 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-LcNrlKExlzjo4XK3+80rONNOvx7BxUYh46rbHPTZ0W4=", + "narHash": "sha256-LB6s98L2OEDG6p79qlbp0OeMJ0t89qGaIjXSQyaLjpk=", "path": "../../mypackages", "type": "path" }, @@ -387,11 +387,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1693158576, - "narHash": "sha256-aRTTXkYvhXosGx535iAFUaoFboUrZSYb1Ooih/auGp0=", - "owner": "nixos", + "lastModified": 1708475490, + "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "a999c1cc0c9eb2095729d5aa03e0d8f7ed256780", + "rev": "0e74ca98a74bc7270d28838369593635a5db3260", "type": "github" }, "original": { @@ -455,7 +455,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-kYdljzySZwf9miB2mMHz8SsQHjVTkwuQ2oYNkijYyII=", + "narHash": "sha256-a+XNRoZjx2k5uyAFCF/4OKxF3XUwxf+ECZJvnIphrEs=", "path": "../../flakes/private/system", "type": "path" }, 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 ensureUsers = [ { name = "fluentbit"; - ensurePermissions."DATABASE \"fluentbit\"" = "ALL PRIVILEGES"; + ensureDBOwnership = true; } ]; }; -- cgit v1.2.3