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 --- flakes/etherpad-lite/flake.lock | 2 +- flakes/flake.lock | 76 +++++++++++----------- flakes/grocy/flake.lock | 2 +- .../overlays/databases/postgresql/default.nix | 3 +- flakes/private/system/flake.lock | 2 +- flakes/private/system/flake.nix | 2 +- flakes/surfer/flake.lock | 2 +- 7 files changed, 45 insertions(+), 44 deletions(-) (limited to 'flakes') diff --git a/flakes/etherpad-lite/flake.lock b/flakes/etherpad-lite/flake.lock index cbb98a3..e6c02c8 100644 --- a/flakes/etherpad-lite/flake.lock +++ b/flakes/etherpad-lite/flake.lock @@ -58,7 +58,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-LcNrlKExlzjo4XK3+80rONNOvx7BxUYh46rbHPTZ0W4=", + "narHash": "sha256-LB6s98L2OEDG6p79qlbp0OeMJ0t89qGaIjXSQyaLjpk=", "path": "../mypackages", "type": "path" }, diff --git a/flakes/flake.lock b/flakes/flake.lock index 347b697..359762a 100644 --- a/flakes/flake.lock +++ b/flakes/flake.lock @@ -3016,7 +3016,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-LcNrlKExlzjo4XK3+80rONNOvx7BxUYh46rbHPTZ0W4=", + "narHash": "sha256-LB6s98L2OEDG6p79qlbp0OeMJ0t89qGaIjXSQyaLjpk=", "path": "../../mypackages", "type": "path" }, @@ -3033,7 +3033,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-LcNrlKExlzjo4XK3+80rONNOvx7BxUYh46rbHPTZ0W4=", + "narHash": "sha256-LB6s98L2OEDG6p79qlbp0OeMJ0t89qGaIjXSQyaLjpk=", "path": "../mypackages", "type": "path" }, @@ -3050,7 +3050,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-LcNrlKExlzjo4XK3+80rONNOvx7BxUYh46rbHPTZ0W4=", + "narHash": "sha256-LB6s98L2OEDG6p79qlbp0OeMJ0t89qGaIjXSQyaLjpk=", "path": "../mypackages", "type": "path" }, @@ -3067,7 +3067,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-LcNrlKExlzjo4XK3+80rONNOvx7BxUYh46rbHPTZ0W4=", + "narHash": "sha256-LB6s98L2OEDG6p79qlbp0OeMJ0t89qGaIjXSQyaLjpk=", "path": "../../mypackages", "type": "path" }, @@ -3084,7 +3084,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-LcNrlKExlzjo4XK3+80rONNOvx7BxUYh46rbHPTZ0W4=", + "narHash": "sha256-LB6s98L2OEDG6p79qlbp0OeMJ0t89qGaIjXSQyaLjpk=", "path": "../mypackages", "type": "path" }, @@ -3101,7 +3101,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-LcNrlKExlzjo4XK3+80rONNOvx7BxUYh46rbHPTZ0W4=", + "narHash": "sha256-LB6s98L2OEDG6p79qlbp0OeMJ0t89qGaIjXSQyaLjpk=", "path": "../../mypackages", "type": "path" }, @@ -3118,7 +3118,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-LcNrlKExlzjo4XK3+80rONNOvx7BxUYh46rbHPTZ0W4=", + "narHash": "sha256-LB6s98L2OEDG6p79qlbp0OeMJ0t89qGaIjXSQyaLjpk=", "path": "../../mypackages", "type": "path" }, @@ -3135,7 +3135,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-LcNrlKExlzjo4XK3+80rONNOvx7BxUYh46rbHPTZ0W4=", + "narHash": "sha256-LB6s98L2OEDG6p79qlbp0OeMJ0t89qGaIjXSQyaLjpk=", "path": "../mypackages", "type": "path" }, @@ -3152,7 +3152,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-LcNrlKExlzjo4XK3+80rONNOvx7BxUYh46rbHPTZ0W4=", + "narHash": "sha256-LB6s98L2OEDG6p79qlbp0OeMJ0t89qGaIjXSQyaLjpk=", "path": "../mypackages", "type": "path" }, @@ -3169,7 +3169,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-LcNrlKExlzjo4XK3+80rONNOvx7BxUYh46rbHPTZ0W4=", + "narHash": "sha256-LB6s98L2OEDG6p79qlbp0OeMJ0t89qGaIjXSQyaLjpk=", "path": "../mypackages", "type": "path" }, @@ -3186,7 +3186,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-LcNrlKExlzjo4XK3+80rONNOvx7BxUYh46rbHPTZ0W4=", + "narHash": "sha256-LB6s98L2OEDG6p79qlbp0OeMJ0t89qGaIjXSQyaLjpk=", "path": "../../mypackages", "type": "path" }, @@ -3203,7 +3203,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-LcNrlKExlzjo4XK3+80rONNOvx7BxUYh46rbHPTZ0W4=", + "narHash": "sha256-LB6s98L2OEDG6p79qlbp0OeMJ0t89qGaIjXSQyaLjpk=", "path": "../../mypackages", "type": "path" }, @@ -3220,7 +3220,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-LcNrlKExlzjo4XK3+80rONNOvx7BxUYh46rbHPTZ0W4=", + "narHash": "sha256-LB6s98L2OEDG6p79qlbp0OeMJ0t89qGaIjXSQyaLjpk=", "path": "../../mypackages", "type": "path" }, @@ -3753,7 +3753,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-7K5qLzgMQLvK/F5bLiEk4/W7eAgRuEN2HhHgk81E0DQ=", + "narHash": "sha256-z8jKG8vF20YZLuzLYiLLNp7emsIf5VWQBSFanAv2cF4=", "path": "../systems/backup-2", "type": "path" }, @@ -3776,7 +3776,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-iUVIgBHGHApO98/lCXid4wDYbF9+pacpWB5uw9Z5uMA=", + "narHash": "sha256-BkCRyrS5N4RxSYHWH/ut296JwKcp6HbR/H6r4CTfFxU=", "path": "../systems/dilion", "type": "path" }, @@ -3824,7 +3824,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-xBYNZL14ZUi3gPGgUjUAxuAVD81lTNGxh58LAViJ8Ds=", + "narHash": "sha256-h37uZfLvL8aZZiQY1s5MxaXHqkdYiM9UekBs6EI/Mh0=", "path": "../systems/eldiron", "type": "path" }, @@ -3850,7 +3850,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-O010KOnmAxOhyU5aFdOp6FqwOcVtv2vdxEjlbL0Wkz8=", + "narHash": "sha256-Z9+/LKeS+VM7wCGFv9tecc5sGTmKLAlk2PH6T0PYuMk=", "path": "../systems/monitoring-1", "type": "path" }, @@ -3875,7 +3875,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-zgFIriAb/uUyNe2iF7F+WkBknNEECfNS8ImJ4EXpLnQ=", + "narHash": "sha256-r1/gDtef4KBK3vWhQF4hMb/pRs0olhilDjUBXdIb+uM=", "path": "../systems/quatresaisons", "type": "path" }, @@ -3895,7 +3895,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-1vKyj7dkvDFz8PUWcnhbBDCqcdTvuj8arrR6zsAUH/4=", + "narHash": "sha256-NjuGFIxBJ3hIxk2fnZeQOvWa+jDHbGsIRpKT5I+cRz4=", "path": "../systems/zoldene", "type": "path" }, @@ -6202,11 +6202,11 @@ }, "nixpkgs_70": { "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": { @@ -7499,7 +7499,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-kYdljzySZwf9miB2mMHz8SsQHjVTkwuQ2oYNkijYyII=", + "narHash": "sha256-a+XNRoZjx2k5uyAFCF/4OKxF3XUwxf+ECZJvnIphrEs=", "path": "../../flakes/private/system", "type": "path" }, @@ -7518,7 +7518,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-kYdljzySZwf9miB2mMHz8SsQHjVTkwuQ2oYNkijYyII=", + "narHash": "sha256-a+XNRoZjx2k5uyAFCF/4OKxF3XUwxf+ECZJvnIphrEs=", "path": "../../flakes/private/system", "type": "path" }, @@ -7571,7 +7571,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-Wt3xfm8KNHMi14Dgis5Rh7fuAGwt5FTvZxRmynuaxhA=", + "narHash": "sha256-TY7xhDa/htWaMqdVrR9FuDuF/Qpur/tbyItGiaa4Bfc=", "path": "../../flakes/etherpad-lite", "type": "path" }, @@ -7613,7 +7613,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-KmjwOUD6Z4Zu/uF77P8lRROnEzCY3/e3y0k3gzOfpGs=", + "narHash": "sha256-5sQ5m5pO1gjPFnArYeU/dXFVnc6rZQDu2kuSzSe0wlo=", "path": "../../flakes/grocy", "type": "path" }, @@ -7694,7 +7694,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-LcNrlKExlzjo4XK3+80rONNOvx7BxUYh46rbHPTZ0W4=", + "narHash": "sha256-LB6s98L2OEDG6p79qlbp0OeMJ0t89qGaIjXSQyaLjpk=", "path": "../../flakes/mypackages", "type": "path" }, @@ -7817,7 +7817,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-eHQbOu6qaTNN/2AFUT+bVGsQOzRowKdoRIgOwVZmSGI=", + "narHash": "sha256-XUfcpd5m6smfhWOG4ICxAanwpTollGBI0/zNPh6BHAE=", "path": "../../flakes/surfer", "type": "path" }, @@ -7962,7 +7962,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-Wt3xfm8KNHMi14Dgis5Rh7fuAGwt5FTvZxRmynuaxhA=", + "narHash": "sha256-TY7xhDa/htWaMqdVrR9FuDuF/Qpur/tbyItGiaa4Bfc=", "path": "./etherpad-lite", "type": "path" }, @@ -8004,7 +8004,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-KmjwOUD6Z4Zu/uF77P8lRROnEzCY3/e3y0k3gzOfpGs=", + "narHash": "sha256-5sQ5m5pO1gjPFnArYeU/dXFVnc6rZQDu2kuSzSe0wlo=", "path": "./grocy", "type": "path" }, @@ -8104,7 +8104,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-LcNrlKExlzjo4XK3+80rONNOvx7BxUYh46rbHPTZ0W4=", + "narHash": "sha256-LB6s98L2OEDG6p79qlbp0OeMJ0t89qGaIjXSQyaLjpk=", "path": "./mypackages", "type": "path" }, @@ -8409,7 +8409,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-kYdljzySZwf9miB2mMHz8SsQHjVTkwuQ2oYNkijYyII=", + "narHash": "sha256-a+XNRoZjx2k5uyAFCF/4OKxF3XUwxf+ECZJvnIphrEs=", "path": "./private/system", "type": "path" }, @@ -8451,7 +8451,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-eHQbOu6qaTNN/2AFUT+bVGsQOzRowKdoRIgOwVZmSGI=", + "narHash": "sha256-XUfcpd5m6smfhWOG4ICxAanwpTollGBI0/zNPh6BHAE=", "path": "./surfer", "type": "path" }, @@ -9015,7 +9015,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-kYdljzySZwf9miB2mMHz8SsQHjVTkwuQ2oYNkijYyII=", + "narHash": "sha256-a+XNRoZjx2k5uyAFCF/4OKxF3XUwxf+ECZJvnIphrEs=", "path": "../../flakes/private/system", "type": "path" }, @@ -9034,7 +9034,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-kYdljzySZwf9miB2mMHz8SsQHjVTkwuQ2oYNkijYyII=", + "narHash": "sha256-a+XNRoZjx2k5uyAFCF/4OKxF3XUwxf+ECZJvnIphrEs=", "path": "../../flakes/private/system", "type": "path" }, @@ -9053,7 +9053,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-kYdljzySZwf9miB2mMHz8SsQHjVTkwuQ2oYNkijYyII=", + "narHash": "sha256-a+XNRoZjx2k5uyAFCF/4OKxF3XUwxf+ECZJvnIphrEs=", "path": "../../flakes/private/system", "type": "path" }, @@ -9072,7 +9072,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-kYdljzySZwf9miB2mMHz8SsQHjVTkwuQ2oYNkijYyII=", + "narHash": "sha256-a+XNRoZjx2k5uyAFCF/4OKxF3XUwxf+ECZJvnIphrEs=", "path": "../../flakes/private/system", "type": "path" }, diff --git a/flakes/grocy/flake.lock b/flakes/grocy/flake.lock index 2b039ea..b935cd7 100644 --- a/flakes/grocy/flake.lock +++ b/flakes/grocy/flake.lock @@ -58,7 +58,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-LcNrlKExlzjo4XK3+80rONNOvx7BxUYh46rbHPTZ0W4=", + "narHash": "sha256-LB6s98L2OEDG6p79qlbp0OeMJ0t89qGaIjXSQyaLjpk=", "path": "../mypackages", "type": "path" }, diff --git a/flakes/mypackages/overlays/databases/postgresql/default.nix b/flakes/mypackages/overlays/databases/postgresql/default.nix index 9ada29c..5287232 100644 --- a/flakes/mypackages/overlays/databases/postgresql/default.nix +++ b/flakes/mypackages/overlays/databases/postgresql/default.nix @@ -1,5 +1,6 @@ self: super: rec { - postgresql_pam = super.postgresql_11.overrideAttrs(old: { + postgresql_system = super.postgresql_11; + postgresql_pam = self.postgresql_system.overrideAttrs(old: { # datadir in /var/lib/postgresql is named after psqlSchema passthru = old.passthru // { psqlSchema = "11.0"; }; configureFlags = old.configureFlags ++ [ "--with-pam" ]; diff --git a/flakes/private/system/flake.lock b/flakes/private/system/flake.lock index ca3e6f7..162068d 100644 --- a/flakes/private/system/flake.lock +++ b/flakes/private/system/flake.lock @@ -69,7 +69,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-LcNrlKExlzjo4XK3+80rONNOvx7BxUYh46rbHPTZ0W4=", + "narHash": "sha256-LB6s98L2OEDG6p79qlbp0OeMJ0t89qGaIjXSQyaLjpk=", "path": "../../mypackages", "type": "path" }, diff --git a/flakes/private/system/flake.nix b/flakes/private/system/flake.nix index 179d960..ad6c58c 100644 --- a/flakes/private/system/flake.nix +++ b/flakes/private/system/flake.nix @@ -130,7 +130,7 @@ }; services.fail2ban.jails.DEFAULT = { - settings.bantime = "12h"; + settings.bantime = lib.mkForce "12h"; settings.findtime = "12h"; }; services.fail2ban = { diff --git a/flakes/surfer/flake.lock b/flakes/surfer/flake.lock index 97f4c97..1686ce7 100644 --- a/flakes/surfer/flake.lock +++ b/flakes/surfer/flake.lock @@ -41,7 +41,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-LcNrlKExlzjo4XK3+80rONNOvx7BxUYh46rbHPTZ0W4=", + "narHash": "sha256-LB6s98L2OEDG6p79qlbp0OeMJ0t89qGaIjXSQyaLjpk=", "path": "../mypackages", "type": "path" }, -- cgit v1.2.3