aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--deploy/flake.lock78
-rw-r--r--flake.lock70
-rw-r--r--flakes/etherpad-lite/flake.lock2
-rw-r--r--flakes/flake.lock68
-rw-r--r--flakes/grocy/flake.lock2
-rw-r--r--flakes/mypackages/pkgs/webapps/roundcubemail/add_all.patch198
-rw-r--r--flakes/mypackages/pkgs/webapps/roundcubemail/default.nix20
-rw-r--r--flakes/mypackages/pkgs/webapps/roundcubemail/md5.patch22
-rw-r--r--flakes/mypackages/pkgs/webapps/roundcubemail/plugins/carddav/default.nix6
-rw-r--r--flakes/mypackages/pkgs/webapps/roundcubemail/plugins/contextmenu/default.nix4
-rw-r--r--flakes/mypackages/pkgs/webapps/roundcubemail/plugins/contextmenu_folder/default.nix4
-rw-r--r--flakes/mypackages/pkgs/webapps/roundcubemail/plugins/ident_switch/default.nix4
-rw-r--r--flakes/mypackages/pkgs/webapps/roundcubemail/plugins/thunderbird_labels/default.nix4
-rw-r--r--flakes/mypackages/pkgs/webapps/spip/default.nix4
-rw-r--r--flakes/private/system/flake.lock2
-rw-r--r--flakes/private/system/flake.nix1
-rw-r--r--flakes/surfer/flake.lock2
-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/eldiron/websites/mail/default.nix4
-rw-r--r--systems/eldiron/websites/mail/roundcubemail.nix13
-rw-r--r--systems/monitoring-1/flake.lock4
-rw-r--r--systems/quatresaisons/flake.lock4
-rw-r--r--systems/zoldene/flake.lock4
-rw-r--r--systems/zoldene/logging.nix5
26 files changed, 260 insertions, 291 deletions
diff --git a/deploy/flake.lock b/deploy/flake.lock
index c2c6375..9f79469 100644
--- a/deploy/flake.lock
+++ b/deploy/flake.lock
@@ -2783,7 +2783,7 @@
2783 }, 2783 },
2784 "locked": { 2784 "locked": {
2785 "lastModified": 1, 2785 "lastModified": 1,
2786 "narHash": "sha256-j0OnENErgwj9vDdg8EUu8gBZkVmJ9dMhtdV+7rTkiCQ=", 2786 "narHash": "sha256-bacTCDQeddb777/pYiLIhcSvxbc1WDQSXKqfTCJPzwo=",
2787 "path": "../flakes", 2787 "path": "../flakes",
2788 "type": "path" 2788 "type": "path"
2789 }, 2789 },
@@ -3095,7 +3095,7 @@
3095 }, 3095 },
3096 "locked": { 3096 "locked": {
3097 "lastModified": 1, 3097 "lastModified": 1,
3098 "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", 3098 "narHash": "sha256-r3UkR0dalaU+FjmDcrMkXeT3BOJryAVzX7Sp8pihjno=",
3099 "path": "../../mypackages", 3099 "path": "../../mypackages",
3100 "type": "path" 3100 "type": "path"
3101 }, 3101 },
@@ -3112,7 +3112,7 @@
3112 }, 3112 },
3113 "locked": { 3113 "locked": {
3114 "lastModified": 1, 3114 "lastModified": 1,
3115 "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", 3115 "narHash": "sha256-r3UkR0dalaU+FjmDcrMkXeT3BOJryAVzX7Sp8pihjno=",
3116 "path": "../mypackages", 3116 "path": "../mypackages",
3117 "type": "path" 3117 "type": "path"
3118 }, 3118 },
@@ -3129,7 +3129,7 @@
3129 }, 3129 },
3130 "locked": { 3130 "locked": {
3131 "lastModified": 1, 3131 "lastModified": 1,
3132 "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", 3132 "narHash": "sha256-r3UkR0dalaU+FjmDcrMkXeT3BOJryAVzX7Sp8pihjno=",
3133 "path": "../mypackages", 3133 "path": "../mypackages",
3134 "type": "path" 3134 "type": "path"
3135 }, 3135 },
@@ -3146,7 +3146,7 @@
3146 }, 3146 },
3147 "locked": { 3147 "locked": {
3148 "lastModified": 1, 3148 "lastModified": 1,
3149 "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", 3149 "narHash": "sha256-r3UkR0dalaU+FjmDcrMkXeT3BOJryAVzX7Sp8pihjno=",
3150 "path": "../../mypackages", 3150 "path": "../../mypackages",
3151 "type": "path" 3151 "type": "path"
3152 }, 3152 },
@@ -3163,7 +3163,7 @@
3163 }, 3163 },
3164 "locked": { 3164 "locked": {
3165 "lastModified": 1, 3165 "lastModified": 1,
3166 "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", 3166 "narHash": "sha256-r3UkR0dalaU+FjmDcrMkXeT3BOJryAVzX7Sp8pihjno=",
3167 "path": "../mypackages", 3167 "path": "../mypackages",
3168 "type": "path" 3168 "type": "path"
3169 }, 3169 },
@@ -3180,7 +3180,7 @@
3180 }, 3180 },
3181 "locked": { 3181 "locked": {
3182 "lastModified": 1, 3182 "lastModified": 1,
3183 "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", 3183 "narHash": "sha256-r3UkR0dalaU+FjmDcrMkXeT3BOJryAVzX7Sp8pihjno=",
3184 "path": "../../mypackages", 3184 "path": "../../mypackages",
3185 "type": "path" 3185 "type": "path"
3186 }, 3186 },
@@ -3197,7 +3197,7 @@
3197 }, 3197 },
3198 "locked": { 3198 "locked": {
3199 "lastModified": 1, 3199 "lastModified": 1,
3200 "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", 3200 "narHash": "sha256-r3UkR0dalaU+FjmDcrMkXeT3BOJryAVzX7Sp8pihjno=",
3201 "path": "../../mypackages", 3201 "path": "../../mypackages",
3202 "type": "path" 3202 "type": "path"
3203 }, 3203 },
@@ -3214,7 +3214,7 @@
3214 }, 3214 },
3215 "locked": { 3215 "locked": {
3216 "lastModified": 1, 3216 "lastModified": 1,
3217 "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", 3217 "narHash": "sha256-r3UkR0dalaU+FjmDcrMkXeT3BOJryAVzX7Sp8pihjno=",
3218 "path": "../mypackages", 3218 "path": "../mypackages",
3219 "type": "path" 3219 "type": "path"
3220 }, 3220 },
@@ -3231,7 +3231,7 @@
3231 }, 3231 },
3232 "locked": { 3232 "locked": {
3233 "lastModified": 1, 3233 "lastModified": 1,
3234 "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", 3234 "narHash": "sha256-r3UkR0dalaU+FjmDcrMkXeT3BOJryAVzX7Sp8pihjno=",
3235 "path": "../mypackages", 3235 "path": "../mypackages",
3236 "type": "path" 3236 "type": "path"
3237 }, 3237 },
@@ -3248,7 +3248,7 @@
3248 }, 3248 },
3249 "locked": { 3249 "locked": {
3250 "lastModified": 1, 3250 "lastModified": 1,
3251 "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", 3251 "narHash": "sha256-r3UkR0dalaU+FjmDcrMkXeT3BOJryAVzX7Sp8pihjno=",
3252 "path": "../mypackages", 3252 "path": "../mypackages",
3253 "type": "path" 3253 "type": "path"
3254 }, 3254 },
@@ -3265,7 +3265,7 @@
3265 }, 3265 },
3266 "locked": { 3266 "locked": {
3267 "lastModified": 1, 3267 "lastModified": 1,
3268 "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", 3268 "narHash": "sha256-r3UkR0dalaU+FjmDcrMkXeT3BOJryAVzX7Sp8pihjno=",
3269 "path": "../../mypackages", 3269 "path": "../../mypackages",
3270 "type": "path" 3270 "type": "path"
3271 }, 3271 },
@@ -3282,7 +3282,7 @@
3282 }, 3282 },
3283 "locked": { 3283 "locked": {
3284 "lastModified": 1, 3284 "lastModified": 1,
3285 "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", 3285 "narHash": "sha256-r3UkR0dalaU+FjmDcrMkXeT3BOJryAVzX7Sp8pihjno=",
3286 "path": "../../mypackages", 3286 "path": "../../mypackages",
3287 "type": "path" 3287 "type": "path"
3288 }, 3288 },
@@ -3299,7 +3299,7 @@
3299 }, 3299 },
3300 "locked": { 3300 "locked": {
3301 "lastModified": 1, 3301 "lastModified": 1,
3302 "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", 3302 "narHash": "sha256-r3UkR0dalaU+FjmDcrMkXeT3BOJryAVzX7Sp8pihjno=",
3303 "path": "../../mypackages", 3303 "path": "../../mypackages",
3304 "type": "path" 3304 "type": "path"
3305 }, 3305 },
@@ -3832,7 +3832,7 @@
3832 }, 3832 },
3833 "locked": { 3833 "locked": {
3834 "lastModified": 1, 3834 "lastModified": 1,
3835 "narHash": "sha256-60yr/wCF+U3z+wYR+UEgM+68nc4/CWkoIAjJsMpUG8c=", 3835 "narHash": "sha256-EPkvkGTy7RlhCXcngA/zGfXuiai7kE8YSL2siYe8HOI=",
3836 "path": "../systems/backup-2", 3836 "path": "../systems/backup-2",
3837 "type": "path" 3837 "type": "path"
3838 }, 3838 },
@@ -3855,7 +3855,7 @@
3855 }, 3855 },
3856 "locked": { 3856 "locked": {
3857 "lastModified": 1, 3857 "lastModified": 1,
3858 "narHash": "sha256-9geQj091r2/Sxi8/ghsp5mO8MIT/kT+nEL3PKgwuApc=", 3858 "narHash": "sha256-Sp43q2mOqHR6UC2mPGdGWj+dTUAD4hzoHQWk64Piu/Q=",
3859 "path": "../systems/dilion", 3859 "path": "../systems/dilion",
3860 "type": "path" 3860 "type": "path"
3861 }, 3861 },
@@ -3903,7 +3903,7 @@
3903 }, 3903 },
3904 "locked": { 3904 "locked": {
3905 "lastModified": 1, 3905 "lastModified": 1,
3906 "narHash": "sha256-MB/c+BVgQQ3qjAchd1Oe8qvg9UbFcY0xhxpj9RkEOnI=", 3906 "narHash": "sha256-GP5n6/p0kgd0lf6KhPZqZxybcUPA38kl054Uo6CWYkE=",
3907 "path": "../systems/eldiron", 3907 "path": "../systems/eldiron",
3908 "type": "path" 3908 "type": "path"
3909 }, 3909 },
@@ -3929,7 +3929,7 @@
3929 }, 3929 },
3930 "locked": { 3930 "locked": {
3931 "lastModified": 1, 3931 "lastModified": 1,
3932 "narHash": "sha256-nV8j6HW6B93HEbeiy43tKCGV9J6xR7jIkAUZVbkKDt4=", 3932 "narHash": "sha256-AYRehPJWG8IX6ax4B9m2Gc3szaa6KpsmAgQ+OCvWRkE=",
3933 "path": "../systems/monitoring-1", 3933 "path": "../systems/monitoring-1",
3934 "type": "path" 3934 "type": "path"
3935 }, 3935 },
@@ -3954,7 +3954,7 @@
3954 }, 3954 },
3955 "locked": { 3955 "locked": {
3956 "lastModified": 1, 3956 "lastModified": 1,
3957 "narHash": "sha256-4vXBjKeelh3z1l7ZYO0ucB2cZPuVJsYX7yZV3MDGqdk=", 3957 "narHash": "sha256-VKSxqw7AR3tAS6EtSTEmBp68u+/0dA2fIcIgEmn3RVU=",
3958 "path": "../systems/quatresaisons", 3958 "path": "../systems/quatresaisons",
3959 "type": "path" 3959 "type": "path"
3960 }, 3960 },
@@ -3974,7 +3974,7 @@
3974 }, 3974 },
3975 "locked": { 3975 "locked": {
3976 "lastModified": 1, 3976 "lastModified": 1,
3977 "narHash": "sha256-Xq8DqtsC5MIUnFBbK1YYSS+eEgqJTeIC7GgFeMs8dAc=", 3977 "narHash": "sha256-tU0Q7/n7wrzPc5NSjGMyB3+/BIt0tzV6v9G7gXS//Zo=",
3978 "path": "../systems/zoldene", 3978 "path": "../systems/zoldene",
3979 "type": "path" 3979 "type": "path"
3980 }, 3980 },
@@ -7656,7 +7656,7 @@
7656 }, 7656 },
7657 "locked": { 7657 "locked": {
7658 "lastModified": 1, 7658 "lastModified": 1,
7659 "narHash": "sha256-5cM87LAHjrWoZRc2QbM6Xu9klzMNBpREjz6sWqp+hFA=", 7659 "narHash": "sha256-uW8mX4yKNyf1lysk3yNW54RILG+JfJ9KQ10dAAge4Hk=",
7660 "path": "../../flakes/private/system", 7660 "path": "../../flakes/private/system",
7661 "type": "path" 7661 "type": "path"
7662 }, 7662 },
@@ -7675,7 +7675,7 @@
7675 }, 7675 },
7676 "locked": { 7676 "locked": {
7677 "lastModified": 1, 7677 "lastModified": 1,
7678 "narHash": "sha256-5cM87LAHjrWoZRc2QbM6Xu9klzMNBpREjz6sWqp+hFA=", 7678 "narHash": "sha256-uW8mX4yKNyf1lysk3yNW54RILG+JfJ9KQ10dAAge4Hk=",
7679 "path": "../../flakes/private/system", 7679 "path": "../../flakes/private/system",
7680 "type": "path" 7680 "type": "path"
7681 }, 7681 },
@@ -7728,7 +7728,7 @@
7728 }, 7728 },
7729 "locked": { 7729 "locked": {
7730 "lastModified": 1, 7730 "lastModified": 1,
7731 "narHash": "sha256-2fWHwmMMILe0enrbMMgFoVH+3PysvSx1Oair4W2hgIw=", 7731 "narHash": "sha256-1uymFn5bZul+Rrnek5YdC2EtgllQlL48VAvQTBh7ao4=",
7732 "path": "../../flakes/etherpad-lite", 7732 "path": "../../flakes/etherpad-lite",
7733 "type": "path" 7733 "type": "path"
7734 }, 7734 },
@@ -7770,7 +7770,7 @@
7770 }, 7770 },
7771 "locked": { 7771 "locked": {
7772 "lastModified": 1, 7772 "lastModified": 1,
7773 "narHash": "sha256-emS5jDCcLaK3/Hqk/2p6jQDxZfO1hPicMTblyVBD7EI=", 7773 "narHash": "sha256-0jKcrg+vVVhfPgfu0kPo4JtgdFXuP29usmgRoSmsX5U=",
7774 "path": "../../flakes/grocy", 7774 "path": "../../flakes/grocy",
7775 "type": "path" 7775 "type": "path"
7776 }, 7776 },
@@ -7851,7 +7851,7 @@
7851 }, 7851 },
7852 "locked": { 7852 "locked": {
7853 "lastModified": 1, 7853 "lastModified": 1,
7854 "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", 7854 "narHash": "sha256-r3UkR0dalaU+FjmDcrMkXeT3BOJryAVzX7Sp8pihjno=",
7855 "path": "../../flakes/mypackages", 7855 "path": "../../flakes/mypackages",
7856 "type": "path" 7856 "type": "path"
7857 }, 7857 },
@@ -7974,7 +7974,7 @@
7974 }, 7974 },
7975 "locked": { 7975 "locked": {
7976 "lastModified": 1, 7976 "lastModified": 1,
7977 "narHash": "sha256-cR14yn0IbWNe98PAlV+MHO6ClQqeT5HztMeLawldtWs=", 7977 "narHash": "sha256-B37mhSriF+N+vwuXTL60SvgxMqIsdiAUsL48g1A6VRY=",
7978 "path": "../../flakes/surfer", 7978 "path": "../../flakes/surfer",
7979 "type": "path" 7979 "type": "path"
7980 }, 7980 },
@@ -8080,7 +8080,7 @@
8080 }, 8080 },
8081 "locked": { 8081 "locked": {
8082 "lastModified": 1, 8082 "lastModified": 1,
8083 "narHash": "sha256-2fWHwmMMILe0enrbMMgFoVH+3PysvSx1Oair4W2hgIw=", 8083 "narHash": "sha256-1uymFn5bZul+Rrnek5YdC2EtgllQlL48VAvQTBh7ao4=",
8084 "path": "./etherpad-lite", 8084 "path": "./etherpad-lite",
8085 "type": "path" 8085 "type": "path"
8086 }, 8086 },
@@ -8122,7 +8122,7 @@
8122 }, 8122 },
8123 "locked": { 8123 "locked": {
8124 "lastModified": 1, 8124 "lastModified": 1,
8125 "narHash": "sha256-emS5jDCcLaK3/Hqk/2p6jQDxZfO1hPicMTblyVBD7EI=", 8125 "narHash": "sha256-0jKcrg+vVVhfPgfu0kPo4JtgdFXuP29usmgRoSmsX5U=",
8126 "path": "./grocy", 8126 "path": "./grocy",
8127 "type": "path" 8127 "type": "path"
8128 }, 8128 },
@@ -8222,7 +8222,7 @@
8222 }, 8222 },
8223 "locked": { 8223 "locked": {
8224 "lastModified": 1, 8224 "lastModified": 1,
8225 "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", 8225 "narHash": "sha256-r3UkR0dalaU+FjmDcrMkXeT3BOJryAVzX7Sp8pihjno=",
8226 "path": "./mypackages", 8226 "path": "./mypackages",
8227 "type": "path" 8227 "type": "path"
8228 }, 8228 },
@@ -8527,7 +8527,7 @@
8527 }, 8527 },
8528 "locked": { 8528 "locked": {
8529 "lastModified": 1, 8529 "lastModified": 1,
8530 "narHash": "sha256-5cM87LAHjrWoZRc2QbM6Xu9klzMNBpREjz6sWqp+hFA=", 8530 "narHash": "sha256-uW8mX4yKNyf1lysk3yNW54RILG+JfJ9KQ10dAAge4Hk=",
8531 "path": "./private/system", 8531 "path": "./private/system",
8532 "type": "path" 8532 "type": "path"
8533 }, 8533 },
@@ -8569,7 +8569,7 @@
8569 }, 8569 },
8570 "locked": { 8570 "locked": {
8571 "lastModified": 1, 8571 "lastModified": 1,
8572 "narHash": "sha256-cR14yn0IbWNe98PAlV+MHO6ClQqeT5HztMeLawldtWs=", 8572 "narHash": "sha256-B37mhSriF+N+vwuXTL60SvgxMqIsdiAUsL48g1A6VRY=",
8573 "path": "./surfer", 8573 "path": "./surfer",
8574 "type": "path" 8574 "type": "path"
8575 }, 8575 },
@@ -8888,11 +8888,11 @@
8888 "nixpkgs": "nixpkgs_106" 8888 "nixpkgs": "nixpkgs_106"
8889 }, 8889 },
8890 "locked": { 8890 "locked": {
8891 "lastModified": 1722637825, 8891 "lastModified": 1728743171,
8892 "narHash": "sha256-nVRtZ9lu7ILJPA+wNn5D+5R7nJBKtfY0Rx335xVUYFw=", 8892 "narHash": "sha256-Dhy2zzlMMRyxc1YDXWEbsHq06urRBMl8HHcRVxpYaHg=",
8893 "ref": "master", 8893 "ref": "master",
8894 "rev": "c0221952994e304539e9cccd5db8e818df4e6e51", 8894 "rev": "1ec4bcb402b587cb9492fd25a9d21eff6cc0d876",
8895 "revCount": 747, 8895 "revCount": 752,
8896 "type": "git", 8896 "type": "git",
8897 "url": "git+ssh://gitolite@git.immae.eu/perso/Immae/Config/Nix/Nixops/Secrets" 8897 "url": "git+ssh://gitolite@git.immae.eu/perso/Immae/Config/Nix/Nixops/Secrets"
8898 }, 8898 },
@@ -9140,7 +9140,7 @@
9140 }, 9140 },
9141 "locked": { 9141 "locked": {
9142 "lastModified": 1, 9142 "lastModified": 1,
9143 "narHash": "sha256-5cM87LAHjrWoZRc2QbM6Xu9klzMNBpREjz6sWqp+hFA=", 9143 "narHash": "sha256-uW8mX4yKNyf1lysk3yNW54RILG+JfJ9KQ10dAAge4Hk=",
9144 "path": "../../flakes/private/system", 9144 "path": "../../flakes/private/system",
9145 "type": "path" 9145 "type": "path"
9146 }, 9146 },
@@ -9159,7 +9159,7 @@
9159 }, 9159 },
9160 "locked": { 9160 "locked": {
9161 "lastModified": 1, 9161 "lastModified": 1,
9162 "narHash": "sha256-5cM87LAHjrWoZRc2QbM6Xu9klzMNBpREjz6sWqp+hFA=", 9162 "narHash": "sha256-uW8mX4yKNyf1lysk3yNW54RILG+JfJ9KQ10dAAge4Hk=",
9163 "path": "../../flakes/private/system", 9163 "path": "../../flakes/private/system",
9164 "type": "path" 9164 "type": "path"
9165 }, 9165 },
@@ -9178,7 +9178,7 @@
9178 }, 9178 },
9179 "locked": { 9179 "locked": {
9180 "lastModified": 1, 9180 "lastModified": 1,
9181 "narHash": "sha256-5cM87LAHjrWoZRc2QbM6Xu9klzMNBpREjz6sWqp+hFA=", 9181 "narHash": "sha256-uW8mX4yKNyf1lysk3yNW54RILG+JfJ9KQ10dAAge4Hk=",
9182 "path": "../../flakes/private/system", 9182 "path": "../../flakes/private/system",
9183 "type": "path" 9183 "type": "path"
9184 }, 9184 },
@@ -9197,7 +9197,7 @@
9197 }, 9197 },
9198 "locked": { 9198 "locked": {
9199 "lastModified": 1, 9199 "lastModified": 1,
9200 "narHash": "sha256-5cM87LAHjrWoZRc2QbM6Xu9klzMNBpREjz6sWqp+hFA=", 9200 "narHash": "sha256-uW8mX4yKNyf1lysk3yNW54RILG+JfJ9KQ10dAAge4Hk=",
9201 "path": "../../flakes/private/system", 9201 "path": "../../flakes/private/system",
9202 "type": "path" 9202 "type": "path"
9203 }, 9203 },
diff --git a/flake.lock b/flake.lock
index f3760cc..8bff4a1 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2664,7 +2664,7 @@
2664 }, 2664 },
2665 "locked": { 2665 "locked": {
2666 "lastModified": 1, 2666 "lastModified": 1,
2667 "narHash": "sha256-j0OnENErgwj9vDdg8EUu8gBZkVmJ9dMhtdV+7rTkiCQ=", 2667 "narHash": "sha256-bacTCDQeddb777/pYiLIhcSvxbc1WDQSXKqfTCJPzwo=",
2668 "path": "./flakes", 2668 "path": "./flakes",
2669 "type": "path" 2669 "type": "path"
2670 }, 2670 },
@@ -3111,7 +3111,7 @@
3111 }, 3111 },
3112 "locked": { 3112 "locked": {
3113 "lastModified": 1, 3113 "lastModified": 1,
3114 "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", 3114 "narHash": "sha256-r3UkR0dalaU+FjmDcrMkXeT3BOJryAVzX7Sp8pihjno=",
3115 "path": "../../mypackages", 3115 "path": "../../mypackages",
3116 "type": "path" 3116 "type": "path"
3117 }, 3117 },
@@ -3128,7 +3128,7 @@
3128 }, 3128 },
3129 "locked": { 3129 "locked": {
3130 "lastModified": 1, 3130 "lastModified": 1,
3131 "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", 3131 "narHash": "sha256-r3UkR0dalaU+FjmDcrMkXeT3BOJryAVzX7Sp8pihjno=",
3132 "path": "../mypackages", 3132 "path": "../mypackages",
3133 "type": "path" 3133 "type": "path"
3134 }, 3134 },
@@ -3145,7 +3145,7 @@
3145 }, 3145 },
3146 "locked": { 3146 "locked": {
3147 "lastModified": 1, 3147 "lastModified": 1,
3148 "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", 3148 "narHash": "sha256-r3UkR0dalaU+FjmDcrMkXeT3BOJryAVzX7Sp8pihjno=",
3149 "path": "../mypackages", 3149 "path": "../mypackages",
3150 "type": "path" 3150 "type": "path"
3151 }, 3151 },
@@ -3162,7 +3162,7 @@
3162 }, 3162 },
3163 "locked": { 3163 "locked": {
3164 "lastModified": 1, 3164 "lastModified": 1,
3165 "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", 3165 "narHash": "sha256-r3UkR0dalaU+FjmDcrMkXeT3BOJryAVzX7Sp8pihjno=",
3166 "path": "../../mypackages", 3166 "path": "../../mypackages",
3167 "type": "path" 3167 "type": "path"
3168 }, 3168 },
@@ -3179,7 +3179,7 @@
3179 }, 3179 },
3180 "locked": { 3180 "locked": {
3181 "lastModified": 1, 3181 "lastModified": 1,
3182 "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", 3182 "narHash": "sha256-r3UkR0dalaU+FjmDcrMkXeT3BOJryAVzX7Sp8pihjno=",
3183 "path": "../mypackages", 3183 "path": "../mypackages",
3184 "type": "path" 3184 "type": "path"
3185 }, 3185 },
@@ -3196,7 +3196,7 @@
3196 }, 3196 },
3197 "locked": { 3197 "locked": {
3198 "lastModified": 1, 3198 "lastModified": 1,
3199 "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", 3199 "narHash": "sha256-r3UkR0dalaU+FjmDcrMkXeT3BOJryAVzX7Sp8pihjno=",
3200 "path": "../../mypackages", 3200 "path": "../../mypackages",
3201 "type": "path" 3201 "type": "path"
3202 }, 3202 },
@@ -3213,7 +3213,7 @@
3213 }, 3213 },
3214 "locked": { 3214 "locked": {
3215 "lastModified": 1, 3215 "lastModified": 1,
3216 "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", 3216 "narHash": "sha256-r3UkR0dalaU+FjmDcrMkXeT3BOJryAVzX7Sp8pihjno=",
3217 "path": "../../mypackages", 3217 "path": "../../mypackages",
3218 "type": "path" 3218 "type": "path"
3219 }, 3219 },
@@ -3230,7 +3230,7 @@
3230 }, 3230 },
3231 "locked": { 3231 "locked": {
3232 "lastModified": 1, 3232 "lastModified": 1,
3233 "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", 3233 "narHash": "sha256-r3UkR0dalaU+FjmDcrMkXeT3BOJryAVzX7Sp8pihjno=",
3234 "path": "../mypackages", 3234 "path": "../mypackages",
3235 "type": "path" 3235 "type": "path"
3236 }, 3236 },
@@ -3247,7 +3247,7 @@
3247 }, 3247 },
3248 "locked": { 3248 "locked": {
3249 "lastModified": 1, 3249 "lastModified": 1,
3250 "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", 3250 "narHash": "sha256-r3UkR0dalaU+FjmDcrMkXeT3BOJryAVzX7Sp8pihjno=",
3251 "path": "../mypackages", 3251 "path": "../mypackages",
3252 "type": "path" 3252 "type": "path"
3253 }, 3253 },
@@ -3264,7 +3264,7 @@
3264 }, 3264 },
3265 "locked": { 3265 "locked": {
3266 "lastModified": 1, 3266 "lastModified": 1,
3267 "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", 3267 "narHash": "sha256-r3UkR0dalaU+FjmDcrMkXeT3BOJryAVzX7Sp8pihjno=",
3268 "path": "../mypackages", 3268 "path": "../mypackages",
3269 "type": "path" 3269 "type": "path"
3270 }, 3270 },
@@ -3281,7 +3281,7 @@
3281 }, 3281 },
3282 "locked": { 3282 "locked": {
3283 "lastModified": 1, 3283 "lastModified": 1,
3284 "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", 3284 "narHash": "sha256-r3UkR0dalaU+FjmDcrMkXeT3BOJryAVzX7Sp8pihjno=",
3285 "path": "../../mypackages", 3285 "path": "../../mypackages",
3286 "type": "path" 3286 "type": "path"
3287 }, 3287 },
@@ -3298,7 +3298,7 @@
3298 }, 3298 },
3299 "locked": { 3299 "locked": {
3300 "lastModified": 1, 3300 "lastModified": 1,
3301 "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", 3301 "narHash": "sha256-r3UkR0dalaU+FjmDcrMkXeT3BOJryAVzX7Sp8pihjno=",
3302 "path": "../../mypackages", 3302 "path": "../../mypackages",
3303 "type": "path" 3303 "type": "path"
3304 }, 3304 },
@@ -3315,7 +3315,7 @@
3315 }, 3315 },
3316 "locked": { 3316 "locked": {
3317 "lastModified": 1, 3317 "lastModified": 1,
3318 "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", 3318 "narHash": "sha256-r3UkR0dalaU+FjmDcrMkXeT3BOJryAVzX7Sp8pihjno=",
3319 "path": "../../mypackages", 3319 "path": "../../mypackages",
3320 "type": "path" 3320 "type": "path"
3321 }, 3321 },
@@ -3848,7 +3848,7 @@
3848 }, 3848 },
3849 "locked": { 3849 "locked": {
3850 "lastModified": 1, 3850 "lastModified": 1,
3851 "narHash": "sha256-60yr/wCF+U3z+wYR+UEgM+68nc4/CWkoIAjJsMpUG8c=", 3851 "narHash": "sha256-EPkvkGTy7RlhCXcngA/zGfXuiai7kE8YSL2siYe8HOI=",
3852 "path": "../systems/backup-2", 3852 "path": "../systems/backup-2",
3853 "type": "path" 3853 "type": "path"
3854 }, 3854 },
@@ -3871,7 +3871,7 @@
3871 }, 3871 },
3872 "locked": { 3872 "locked": {
3873 "lastModified": 1, 3873 "lastModified": 1,
3874 "narHash": "sha256-9geQj091r2/Sxi8/ghsp5mO8MIT/kT+nEL3PKgwuApc=", 3874 "narHash": "sha256-Sp43q2mOqHR6UC2mPGdGWj+dTUAD4hzoHQWk64Piu/Q=",
3875 "path": "../systems/dilion", 3875 "path": "../systems/dilion",
3876 "type": "path" 3876 "type": "path"
3877 }, 3877 },
@@ -3919,7 +3919,7 @@
3919 }, 3919 },
3920 "locked": { 3920 "locked": {
3921 "lastModified": 1, 3921 "lastModified": 1,
3922 "narHash": "sha256-MB/c+BVgQQ3qjAchd1Oe8qvg9UbFcY0xhxpj9RkEOnI=", 3922 "narHash": "sha256-GP5n6/p0kgd0lf6KhPZqZxybcUPA38kl054Uo6CWYkE=",
3923 "path": "../systems/eldiron", 3923 "path": "../systems/eldiron",
3924 "type": "path" 3924 "type": "path"
3925 }, 3925 },
@@ -3945,7 +3945,7 @@
3945 }, 3945 },
3946 "locked": { 3946 "locked": {
3947 "lastModified": 1, 3947 "lastModified": 1,
3948 "narHash": "sha256-nV8j6HW6B93HEbeiy43tKCGV9J6xR7jIkAUZVbkKDt4=", 3948 "narHash": "sha256-AYRehPJWG8IX6ax4B9m2Gc3szaa6KpsmAgQ+OCvWRkE=",
3949 "path": "../systems/monitoring-1", 3949 "path": "../systems/monitoring-1",
3950 "type": "path" 3950 "type": "path"
3951 }, 3951 },
@@ -3970,7 +3970,7 @@
3970 }, 3970 },
3971 "locked": { 3971 "locked": {
3972 "lastModified": 1, 3972 "lastModified": 1,
3973 "narHash": "sha256-4vXBjKeelh3z1l7ZYO0ucB2cZPuVJsYX7yZV3MDGqdk=", 3973 "narHash": "sha256-VKSxqw7AR3tAS6EtSTEmBp68u+/0dA2fIcIgEmn3RVU=",
3974 "path": "../systems/quatresaisons", 3974 "path": "../systems/quatresaisons",
3975 "type": "path" 3975 "type": "path"
3976 }, 3976 },
@@ -3990,7 +3990,7 @@
3990 }, 3990 },
3991 "locked": { 3991 "locked": {
3992 "lastModified": 1, 3992 "lastModified": 1,
3993 "narHash": "sha256-Xq8DqtsC5MIUnFBbK1YYSS+eEgqJTeIC7GgFeMs8dAc=", 3993 "narHash": "sha256-tU0Q7/n7wrzPc5NSjGMyB3+/BIt0tzV6v9G7gXS//Zo=",
3994 "path": "../systems/zoldene", 3994 "path": "../systems/zoldene",
3995 "type": "path" 3995 "type": "path"
3996 }, 3996 },
@@ -7672,7 +7672,7 @@
7672 }, 7672 },
7673 "locked": { 7673 "locked": {
7674 "lastModified": 1, 7674 "lastModified": 1,
7675 "narHash": "sha256-5cM87LAHjrWoZRc2QbM6Xu9klzMNBpREjz6sWqp+hFA=", 7675 "narHash": "sha256-uW8mX4yKNyf1lysk3yNW54RILG+JfJ9KQ10dAAge4Hk=",
7676 "path": "../../flakes/private/system", 7676 "path": "../../flakes/private/system",
7677 "type": "path" 7677 "type": "path"
7678 }, 7678 },
@@ -7691,7 +7691,7 @@
7691 }, 7691 },
7692 "locked": { 7692 "locked": {
7693 "lastModified": 1, 7693 "lastModified": 1,
7694 "narHash": "sha256-5cM87LAHjrWoZRc2QbM6Xu9klzMNBpREjz6sWqp+hFA=", 7694 "narHash": "sha256-uW8mX4yKNyf1lysk3yNW54RILG+JfJ9KQ10dAAge4Hk=",
7695 "path": "../../flakes/private/system", 7695 "path": "../../flakes/private/system",
7696 "type": "path" 7696 "type": "path"
7697 }, 7697 },
@@ -7744,7 +7744,7 @@
7744 }, 7744 },
7745 "locked": { 7745 "locked": {
7746 "lastModified": 1, 7746 "lastModified": 1,
7747 "narHash": "sha256-2fWHwmMMILe0enrbMMgFoVH+3PysvSx1Oair4W2hgIw=", 7747 "narHash": "sha256-1uymFn5bZul+Rrnek5YdC2EtgllQlL48VAvQTBh7ao4=",
7748 "path": "../../flakes/etherpad-lite", 7748 "path": "../../flakes/etherpad-lite",
7749 "type": "path" 7749 "type": "path"
7750 }, 7750 },
@@ -7786,7 +7786,7 @@
7786 }, 7786 },
7787 "locked": { 7787 "locked": {
7788 "lastModified": 1, 7788 "lastModified": 1,
7789 "narHash": "sha256-emS5jDCcLaK3/Hqk/2p6jQDxZfO1hPicMTblyVBD7EI=", 7789 "narHash": "sha256-0jKcrg+vVVhfPgfu0kPo4JtgdFXuP29usmgRoSmsX5U=",
7790 "path": "../../flakes/grocy", 7790 "path": "../../flakes/grocy",
7791 "type": "path" 7791 "type": "path"
7792 }, 7792 },
@@ -7867,7 +7867,7 @@
7867 }, 7867 },
7868 "locked": { 7868 "locked": {
7869 "lastModified": 1, 7869 "lastModified": 1,
7870 "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", 7870 "narHash": "sha256-r3UkR0dalaU+FjmDcrMkXeT3BOJryAVzX7Sp8pihjno=",
7871 "path": "../../flakes/mypackages", 7871 "path": "../../flakes/mypackages",
7872 "type": "path" 7872 "type": "path"
7873 }, 7873 },
@@ -7990,7 +7990,7 @@
7990 }, 7990 },
7991 "locked": { 7991 "locked": {
7992 "lastModified": 1, 7992 "lastModified": 1,
7993 "narHash": "sha256-cR14yn0IbWNe98PAlV+MHO6ClQqeT5HztMeLawldtWs=", 7993 "narHash": "sha256-B37mhSriF+N+vwuXTL60SvgxMqIsdiAUsL48g1A6VRY=",
7994 "path": "../../flakes/surfer", 7994 "path": "../../flakes/surfer",
7995 "type": "path" 7995 "type": "path"
7996 }, 7996 },
@@ -8096,7 +8096,7 @@
8096 }, 8096 },
8097 "locked": { 8097 "locked": {
8098 "lastModified": 1, 8098 "lastModified": 1,
8099 "narHash": "sha256-2fWHwmMMILe0enrbMMgFoVH+3PysvSx1Oair4W2hgIw=", 8099 "narHash": "sha256-1uymFn5bZul+Rrnek5YdC2EtgllQlL48VAvQTBh7ao4=",
8100 "path": "./etherpad-lite", 8100 "path": "./etherpad-lite",
8101 "type": "path" 8101 "type": "path"
8102 }, 8102 },
@@ -8138,7 +8138,7 @@
8138 }, 8138 },
8139 "locked": { 8139 "locked": {
8140 "lastModified": 1, 8140 "lastModified": 1,
8141 "narHash": "sha256-emS5jDCcLaK3/Hqk/2p6jQDxZfO1hPicMTblyVBD7EI=", 8141 "narHash": "sha256-0jKcrg+vVVhfPgfu0kPo4JtgdFXuP29usmgRoSmsX5U=",
8142 "path": "./grocy", 8142 "path": "./grocy",
8143 "type": "path" 8143 "type": "path"
8144 }, 8144 },
@@ -8238,7 +8238,7 @@
8238 }, 8238 },
8239 "locked": { 8239 "locked": {
8240 "lastModified": 1, 8240 "lastModified": 1,
8241 "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", 8241 "narHash": "sha256-r3UkR0dalaU+FjmDcrMkXeT3BOJryAVzX7Sp8pihjno=",
8242 "path": "./mypackages", 8242 "path": "./mypackages",
8243 "type": "path" 8243 "type": "path"
8244 }, 8244 },
@@ -8543,7 +8543,7 @@
8543 }, 8543 },
8544 "locked": { 8544 "locked": {
8545 "lastModified": 1, 8545 "lastModified": 1,
8546 "narHash": "sha256-5cM87LAHjrWoZRc2QbM6Xu9klzMNBpREjz6sWqp+hFA=", 8546 "narHash": "sha256-uW8mX4yKNyf1lysk3yNW54RILG+JfJ9KQ10dAAge4Hk=",
8547 "path": "./private/system", 8547 "path": "./private/system",
8548 "type": "path" 8548 "type": "path"
8549 }, 8549 },
@@ -8585,7 +8585,7 @@
8585 }, 8585 },
8586 "locked": { 8586 "locked": {
8587 "lastModified": 1, 8587 "lastModified": 1,
8588 "narHash": "sha256-cR14yn0IbWNe98PAlV+MHO6ClQqeT5HztMeLawldtWs=", 8588 "narHash": "sha256-B37mhSriF+N+vwuXTL60SvgxMqIsdiAUsL48g1A6VRY=",
8589 "path": "./surfer", 8589 "path": "./surfer",
8590 "type": "path" 8590 "type": "path"
8591 }, 8591 },
@@ -9149,7 +9149,7 @@
9149 }, 9149 },
9150 "locked": { 9150 "locked": {
9151 "lastModified": 1, 9151 "lastModified": 1,
9152 "narHash": "sha256-5cM87LAHjrWoZRc2QbM6Xu9klzMNBpREjz6sWqp+hFA=", 9152 "narHash": "sha256-uW8mX4yKNyf1lysk3yNW54RILG+JfJ9KQ10dAAge4Hk=",
9153 "path": "../../flakes/private/system", 9153 "path": "../../flakes/private/system",
9154 "type": "path" 9154 "type": "path"
9155 }, 9155 },
@@ -9168,7 +9168,7 @@
9168 }, 9168 },
9169 "locked": { 9169 "locked": {
9170 "lastModified": 1, 9170 "lastModified": 1,
9171 "narHash": "sha256-5cM87LAHjrWoZRc2QbM6Xu9klzMNBpREjz6sWqp+hFA=", 9171 "narHash": "sha256-uW8mX4yKNyf1lysk3yNW54RILG+JfJ9KQ10dAAge4Hk=",
9172 "path": "../../flakes/private/system", 9172 "path": "../../flakes/private/system",
9173 "type": "path" 9173 "type": "path"
9174 }, 9174 },
@@ -9187,7 +9187,7 @@
9187 }, 9187 },
9188 "locked": { 9188 "locked": {
9189 "lastModified": 1, 9189 "lastModified": 1,
9190 "narHash": "sha256-5cM87LAHjrWoZRc2QbM6Xu9klzMNBpREjz6sWqp+hFA=", 9190 "narHash": "sha256-uW8mX4yKNyf1lysk3yNW54RILG+JfJ9KQ10dAAge4Hk=",
9191 "path": "../../flakes/private/system", 9191 "path": "../../flakes/private/system",
9192 "type": "path" 9192 "type": "path"
9193 }, 9193 },
@@ -9206,7 +9206,7 @@
9206 }, 9206 },
9207 "locked": { 9207 "locked": {
9208 "lastModified": 1, 9208 "lastModified": 1,
9209 "narHash": "sha256-5cM87LAHjrWoZRc2QbM6Xu9klzMNBpREjz6sWqp+hFA=", 9209 "narHash": "sha256-uW8mX4yKNyf1lysk3yNW54RILG+JfJ9KQ10dAAge4Hk=",
9210 "path": "../../flakes/private/system", 9210 "path": "../../flakes/private/system",
9211 "type": "path" 9211 "type": "path"
9212 }, 9212 },
diff --git a/flakes/etherpad-lite/flake.lock b/flakes/etherpad-lite/flake.lock
index 4b29cff..d6390f1 100644
--- a/flakes/etherpad-lite/flake.lock
+++ b/flakes/etherpad-lite/flake.lock
@@ -58,7 +58,7 @@
58 }, 58 },
59 "locked": { 59 "locked": {
60 "lastModified": 1, 60 "lastModified": 1,
61 "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", 61 "narHash": "sha256-r3UkR0dalaU+FjmDcrMkXeT3BOJryAVzX7Sp8pihjno=",
62 "path": "../mypackages", 62 "path": "../mypackages",
63 "type": "path" 63 "type": "path"
64 }, 64 },
diff --git a/flakes/flake.lock b/flakes/flake.lock
index d9fc055..cbdd1a3 100644
--- a/flakes/flake.lock
+++ b/flakes/flake.lock
@@ -3016,7 +3016,7 @@
3016 }, 3016 },
3017 "locked": { 3017 "locked": {
3018 "lastModified": 1, 3018 "lastModified": 1,
3019 "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", 3019 "narHash": "sha256-r3UkR0dalaU+FjmDcrMkXeT3BOJryAVzX7Sp8pihjno=",
3020 "path": "../../mypackages", 3020 "path": "../../mypackages",
3021 "type": "path" 3021 "type": "path"
3022 }, 3022 },
@@ -3033,7 +3033,7 @@
3033 }, 3033 },
3034 "locked": { 3034 "locked": {
3035 "lastModified": 1, 3035 "lastModified": 1,
3036 "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", 3036 "narHash": "sha256-r3UkR0dalaU+FjmDcrMkXeT3BOJryAVzX7Sp8pihjno=",
3037 "path": "../mypackages", 3037 "path": "../mypackages",
3038 "type": "path" 3038 "type": "path"
3039 }, 3039 },
@@ -3050,7 +3050,7 @@
3050 }, 3050 },
3051 "locked": { 3051 "locked": {
3052 "lastModified": 1, 3052 "lastModified": 1,
3053 "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", 3053 "narHash": "sha256-r3UkR0dalaU+FjmDcrMkXeT3BOJryAVzX7Sp8pihjno=",
3054 "path": "../mypackages", 3054 "path": "../mypackages",
3055 "type": "path" 3055 "type": "path"
3056 }, 3056 },
@@ -3067,7 +3067,7 @@
3067 }, 3067 },
3068 "locked": { 3068 "locked": {
3069 "lastModified": 1, 3069 "lastModified": 1,
3070 "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", 3070 "narHash": "sha256-r3UkR0dalaU+FjmDcrMkXeT3BOJryAVzX7Sp8pihjno=",
3071 "path": "../../mypackages", 3071 "path": "../../mypackages",
3072 "type": "path" 3072 "type": "path"
3073 }, 3073 },
@@ -3084,7 +3084,7 @@
3084 }, 3084 },
3085 "locked": { 3085 "locked": {
3086 "lastModified": 1, 3086 "lastModified": 1,
3087 "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", 3087 "narHash": "sha256-r3UkR0dalaU+FjmDcrMkXeT3BOJryAVzX7Sp8pihjno=",
3088 "path": "../mypackages", 3088 "path": "../mypackages",
3089 "type": "path" 3089 "type": "path"
3090 }, 3090 },
@@ -3101,7 +3101,7 @@
3101 }, 3101 },
3102 "locked": { 3102 "locked": {
3103 "lastModified": 1, 3103 "lastModified": 1,
3104 "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", 3104 "narHash": "sha256-r3UkR0dalaU+FjmDcrMkXeT3BOJryAVzX7Sp8pihjno=",
3105 "path": "../../mypackages", 3105 "path": "../../mypackages",
3106 "type": "path" 3106 "type": "path"
3107 }, 3107 },
@@ -3118,7 +3118,7 @@
3118 }, 3118 },
3119 "locked": { 3119 "locked": {
3120 "lastModified": 1, 3120 "lastModified": 1,
3121 "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", 3121 "narHash": "sha256-r3UkR0dalaU+FjmDcrMkXeT3BOJryAVzX7Sp8pihjno=",
3122 "path": "../../mypackages", 3122 "path": "../../mypackages",
3123 "type": "path" 3123 "type": "path"
3124 }, 3124 },
@@ -3135,7 +3135,7 @@
3135 }, 3135 },
3136 "locked": { 3136 "locked": {
3137 "lastModified": 1, 3137 "lastModified": 1,
3138 "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", 3138 "narHash": "sha256-r3UkR0dalaU+FjmDcrMkXeT3BOJryAVzX7Sp8pihjno=",
3139 "path": "../mypackages", 3139 "path": "../mypackages",
3140 "type": "path" 3140 "type": "path"
3141 }, 3141 },
@@ -3152,7 +3152,7 @@
3152 }, 3152 },
3153 "locked": { 3153 "locked": {
3154 "lastModified": 1, 3154 "lastModified": 1,
3155 "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", 3155 "narHash": "sha256-r3UkR0dalaU+FjmDcrMkXeT3BOJryAVzX7Sp8pihjno=",
3156 "path": "../mypackages", 3156 "path": "../mypackages",
3157 "type": "path" 3157 "type": "path"
3158 }, 3158 },
@@ -3169,7 +3169,7 @@
3169 }, 3169 },
3170 "locked": { 3170 "locked": {
3171 "lastModified": 1, 3171 "lastModified": 1,
3172 "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", 3172 "narHash": "sha256-r3UkR0dalaU+FjmDcrMkXeT3BOJryAVzX7Sp8pihjno=",
3173 "path": "../mypackages", 3173 "path": "../mypackages",
3174 "type": "path" 3174 "type": "path"
3175 }, 3175 },
@@ -3186,7 +3186,7 @@
3186 }, 3186 },
3187 "locked": { 3187 "locked": {
3188 "lastModified": 1, 3188 "lastModified": 1,
3189 "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", 3189 "narHash": "sha256-r3UkR0dalaU+FjmDcrMkXeT3BOJryAVzX7Sp8pihjno=",
3190 "path": "../../mypackages", 3190 "path": "../../mypackages",
3191 "type": "path" 3191 "type": "path"
3192 }, 3192 },
@@ -3203,7 +3203,7 @@
3203 }, 3203 },
3204 "locked": { 3204 "locked": {
3205 "lastModified": 1, 3205 "lastModified": 1,
3206 "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", 3206 "narHash": "sha256-r3UkR0dalaU+FjmDcrMkXeT3BOJryAVzX7Sp8pihjno=",
3207 "path": "../../mypackages", 3207 "path": "../../mypackages",
3208 "type": "path" 3208 "type": "path"
3209 }, 3209 },
@@ -3220,7 +3220,7 @@
3220 }, 3220 },
3221 "locked": { 3221 "locked": {
3222 "lastModified": 1, 3222 "lastModified": 1,
3223 "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", 3223 "narHash": "sha256-r3UkR0dalaU+FjmDcrMkXeT3BOJryAVzX7Sp8pihjno=",
3224 "path": "../../mypackages", 3224 "path": "../../mypackages",
3225 "type": "path" 3225 "type": "path"
3226 }, 3226 },
@@ -3753,7 +3753,7 @@
3753 }, 3753 },
3754 "locked": { 3754 "locked": {
3755 "lastModified": 1, 3755 "lastModified": 1,
3756 "narHash": "sha256-60yr/wCF+U3z+wYR+UEgM+68nc4/CWkoIAjJsMpUG8c=", 3756 "narHash": "sha256-EPkvkGTy7RlhCXcngA/zGfXuiai7kE8YSL2siYe8HOI=",
3757 "path": "../systems/backup-2", 3757 "path": "../systems/backup-2",
3758 "type": "path" 3758 "type": "path"
3759 }, 3759 },
@@ -3776,7 +3776,7 @@
3776 }, 3776 },
3777 "locked": { 3777 "locked": {
3778 "lastModified": 1, 3778 "lastModified": 1,
3779 "narHash": "sha256-9geQj091r2/Sxi8/ghsp5mO8MIT/kT+nEL3PKgwuApc=", 3779 "narHash": "sha256-Sp43q2mOqHR6UC2mPGdGWj+dTUAD4hzoHQWk64Piu/Q=",
3780 "path": "../systems/dilion", 3780 "path": "../systems/dilion",
3781 "type": "path" 3781 "type": "path"
3782 }, 3782 },
@@ -3824,7 +3824,7 @@
3824 }, 3824 },
3825 "locked": { 3825 "locked": {
3826 "lastModified": 1, 3826 "lastModified": 1,
3827 "narHash": "sha256-MB/c+BVgQQ3qjAchd1Oe8qvg9UbFcY0xhxpj9RkEOnI=", 3827 "narHash": "sha256-GP5n6/p0kgd0lf6KhPZqZxybcUPA38kl054Uo6CWYkE=",
3828 "path": "../systems/eldiron", 3828 "path": "../systems/eldiron",
3829 "type": "path" 3829 "type": "path"
3830 }, 3830 },
@@ -3850,7 +3850,7 @@
3850 }, 3850 },
3851 "locked": { 3851 "locked": {
3852 "lastModified": 1, 3852 "lastModified": 1,
3853 "narHash": "sha256-nV8j6HW6B93HEbeiy43tKCGV9J6xR7jIkAUZVbkKDt4=", 3853 "narHash": "sha256-AYRehPJWG8IX6ax4B9m2Gc3szaa6KpsmAgQ+OCvWRkE=",
3854 "path": "../systems/monitoring-1", 3854 "path": "../systems/monitoring-1",
3855 "type": "path" 3855 "type": "path"
3856 }, 3856 },
@@ -3875,7 +3875,7 @@
3875 }, 3875 },
3876 "locked": { 3876 "locked": {
3877 "lastModified": 1, 3877 "lastModified": 1,
3878 "narHash": "sha256-4vXBjKeelh3z1l7ZYO0ucB2cZPuVJsYX7yZV3MDGqdk=", 3878 "narHash": "sha256-VKSxqw7AR3tAS6EtSTEmBp68u+/0dA2fIcIgEmn3RVU=",
3879 "path": "../systems/quatresaisons", 3879 "path": "../systems/quatresaisons",
3880 "type": "path" 3880 "type": "path"
3881 }, 3881 },
@@ -3895,7 +3895,7 @@
3895 }, 3895 },
3896 "locked": { 3896 "locked": {
3897 "lastModified": 1, 3897 "lastModified": 1,
3898 "narHash": "sha256-Xq8DqtsC5MIUnFBbK1YYSS+eEgqJTeIC7GgFeMs8dAc=", 3898 "narHash": "sha256-tU0Q7/n7wrzPc5NSjGMyB3+/BIt0tzV6v9G7gXS//Zo=",
3899 "path": "../systems/zoldene", 3899 "path": "../systems/zoldene",
3900 "type": "path" 3900 "type": "path"
3901 }, 3901 },
@@ -7499,7 +7499,7 @@
7499 }, 7499 },
7500 "locked": { 7500 "locked": {
7501 "lastModified": 1, 7501 "lastModified": 1,
7502 "narHash": "sha256-5cM87LAHjrWoZRc2QbM6Xu9klzMNBpREjz6sWqp+hFA=", 7502 "narHash": "sha256-uW8mX4yKNyf1lysk3yNW54RILG+JfJ9KQ10dAAge4Hk=",
7503 "path": "../../flakes/private/system", 7503 "path": "../../flakes/private/system",
7504 "type": "path" 7504 "type": "path"
7505 }, 7505 },
@@ -7518,7 +7518,7 @@
7518 }, 7518 },
7519 "locked": { 7519 "locked": {
7520 "lastModified": 1, 7520 "lastModified": 1,
7521 "narHash": "sha256-5cM87LAHjrWoZRc2QbM6Xu9klzMNBpREjz6sWqp+hFA=", 7521 "narHash": "sha256-uW8mX4yKNyf1lysk3yNW54RILG+JfJ9KQ10dAAge4Hk=",
7522 "path": "../../flakes/private/system", 7522 "path": "../../flakes/private/system",
7523 "type": "path" 7523 "type": "path"
7524 }, 7524 },
@@ -7571,7 +7571,7 @@
7571 }, 7571 },
7572 "locked": { 7572 "locked": {
7573 "lastModified": 1, 7573 "lastModified": 1,
7574 "narHash": "sha256-2fWHwmMMILe0enrbMMgFoVH+3PysvSx1Oair4W2hgIw=", 7574 "narHash": "sha256-1uymFn5bZul+Rrnek5YdC2EtgllQlL48VAvQTBh7ao4=",
7575 "path": "../../flakes/etherpad-lite", 7575 "path": "../../flakes/etherpad-lite",
7576 "type": "path" 7576 "type": "path"
7577 }, 7577 },
@@ -7613,7 +7613,7 @@
7613 }, 7613 },
7614 "locked": { 7614 "locked": {
7615 "lastModified": 1, 7615 "lastModified": 1,
7616 "narHash": "sha256-emS5jDCcLaK3/Hqk/2p6jQDxZfO1hPicMTblyVBD7EI=", 7616 "narHash": "sha256-0jKcrg+vVVhfPgfu0kPo4JtgdFXuP29usmgRoSmsX5U=",
7617 "path": "../../flakes/grocy", 7617 "path": "../../flakes/grocy",
7618 "type": "path" 7618 "type": "path"
7619 }, 7619 },
@@ -7694,7 +7694,7 @@
7694 }, 7694 },
7695 "locked": { 7695 "locked": {
7696 "lastModified": 1, 7696 "lastModified": 1,
7697 "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", 7697 "narHash": "sha256-r3UkR0dalaU+FjmDcrMkXeT3BOJryAVzX7Sp8pihjno=",
7698 "path": "../../flakes/mypackages", 7698 "path": "../../flakes/mypackages",
7699 "type": "path" 7699 "type": "path"
7700 }, 7700 },
@@ -7817,7 +7817,7 @@
7817 }, 7817 },
7818 "locked": { 7818 "locked": {
7819 "lastModified": 1, 7819 "lastModified": 1,
7820 "narHash": "sha256-cR14yn0IbWNe98PAlV+MHO6ClQqeT5HztMeLawldtWs=", 7820 "narHash": "sha256-B37mhSriF+N+vwuXTL60SvgxMqIsdiAUsL48g1A6VRY=",
7821 "path": "../../flakes/surfer", 7821 "path": "../../flakes/surfer",
7822 "type": "path" 7822 "type": "path"
7823 }, 7823 },
@@ -7962,7 +7962,7 @@
7962 }, 7962 },
7963 "locked": { 7963 "locked": {
7964 "lastModified": 1, 7964 "lastModified": 1,
7965 "narHash": "sha256-2fWHwmMMILe0enrbMMgFoVH+3PysvSx1Oair4W2hgIw=", 7965 "narHash": "sha256-1uymFn5bZul+Rrnek5YdC2EtgllQlL48VAvQTBh7ao4=",
7966 "path": "./etherpad-lite", 7966 "path": "./etherpad-lite",
7967 "type": "path" 7967 "type": "path"
7968 }, 7968 },
@@ -8004,7 +8004,7 @@
8004 }, 8004 },
8005 "locked": { 8005 "locked": {
8006 "lastModified": 1, 8006 "lastModified": 1,
8007 "narHash": "sha256-emS5jDCcLaK3/Hqk/2p6jQDxZfO1hPicMTblyVBD7EI=", 8007 "narHash": "sha256-0jKcrg+vVVhfPgfu0kPo4JtgdFXuP29usmgRoSmsX5U=",
8008 "path": "./grocy", 8008 "path": "./grocy",
8009 "type": "path" 8009 "type": "path"
8010 }, 8010 },
@@ -8104,7 +8104,7 @@
8104 }, 8104 },
8105 "locked": { 8105 "locked": {
8106 "lastModified": 1, 8106 "lastModified": 1,
8107 "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", 8107 "narHash": "sha256-r3UkR0dalaU+FjmDcrMkXeT3BOJryAVzX7Sp8pihjno=",
8108 "path": "./mypackages", 8108 "path": "./mypackages",
8109 "type": "path" 8109 "type": "path"
8110 }, 8110 },
@@ -8409,7 +8409,7 @@
8409 }, 8409 },
8410 "locked": { 8410 "locked": {
8411 "lastModified": 1, 8411 "lastModified": 1,
8412 "narHash": "sha256-5cM87LAHjrWoZRc2QbM6Xu9klzMNBpREjz6sWqp+hFA=", 8412 "narHash": "sha256-uW8mX4yKNyf1lysk3yNW54RILG+JfJ9KQ10dAAge4Hk=",
8413 "path": "./private/system", 8413 "path": "./private/system",
8414 "type": "path" 8414 "type": "path"
8415 }, 8415 },
@@ -8451,7 +8451,7 @@
8451 }, 8451 },
8452 "locked": { 8452 "locked": {
8453 "lastModified": 1, 8453 "lastModified": 1,
8454 "narHash": "sha256-cR14yn0IbWNe98PAlV+MHO6ClQqeT5HztMeLawldtWs=", 8454 "narHash": "sha256-B37mhSriF+N+vwuXTL60SvgxMqIsdiAUsL48g1A6VRY=",
8455 "path": "./surfer", 8455 "path": "./surfer",
8456 "type": "path" 8456 "type": "path"
8457 }, 8457 },
@@ -9015,7 +9015,7 @@
9015 }, 9015 },
9016 "locked": { 9016 "locked": {
9017 "lastModified": 1, 9017 "lastModified": 1,
9018 "narHash": "sha256-5cM87LAHjrWoZRc2QbM6Xu9klzMNBpREjz6sWqp+hFA=", 9018 "narHash": "sha256-uW8mX4yKNyf1lysk3yNW54RILG+JfJ9KQ10dAAge4Hk=",
9019 "path": "../../flakes/private/system", 9019 "path": "../../flakes/private/system",
9020 "type": "path" 9020 "type": "path"
9021 }, 9021 },
@@ -9034,7 +9034,7 @@
9034 }, 9034 },
9035 "locked": { 9035 "locked": {
9036 "lastModified": 1, 9036 "lastModified": 1,
9037 "narHash": "sha256-5cM87LAHjrWoZRc2QbM6Xu9klzMNBpREjz6sWqp+hFA=", 9037 "narHash": "sha256-uW8mX4yKNyf1lysk3yNW54RILG+JfJ9KQ10dAAge4Hk=",
9038 "path": "../../flakes/private/system", 9038 "path": "../../flakes/private/system",
9039 "type": "path" 9039 "type": "path"
9040 }, 9040 },
@@ -9053,7 +9053,7 @@
9053 }, 9053 },
9054 "locked": { 9054 "locked": {
9055 "lastModified": 1, 9055 "lastModified": 1,
9056 "narHash": "sha256-5cM87LAHjrWoZRc2QbM6Xu9klzMNBpREjz6sWqp+hFA=", 9056 "narHash": "sha256-uW8mX4yKNyf1lysk3yNW54RILG+JfJ9KQ10dAAge4Hk=",
9057 "path": "../../flakes/private/system", 9057 "path": "../../flakes/private/system",
9058 "type": "path" 9058 "type": "path"
9059 }, 9059 },
@@ -9072,7 +9072,7 @@
9072 }, 9072 },
9073 "locked": { 9073 "locked": {
9074 "lastModified": 1, 9074 "lastModified": 1,
9075 "narHash": "sha256-5cM87LAHjrWoZRc2QbM6Xu9klzMNBpREjz6sWqp+hFA=", 9075 "narHash": "sha256-uW8mX4yKNyf1lysk3yNW54RILG+JfJ9KQ10dAAge4Hk=",
9076 "path": "../../flakes/private/system", 9076 "path": "../../flakes/private/system",
9077 "type": "path" 9077 "type": "path"
9078 }, 9078 },
diff --git a/flakes/grocy/flake.lock b/flakes/grocy/flake.lock
index 3e8cb41..93a43d2 100644
--- a/flakes/grocy/flake.lock
+++ b/flakes/grocy/flake.lock
@@ -58,7 +58,7 @@
58 }, 58 },
59 "locked": { 59 "locked": {
60 "lastModified": 1, 60 "lastModified": 1,
61 "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", 61 "narHash": "sha256-r3UkR0dalaU+FjmDcrMkXeT3BOJryAVzX7Sp8pihjno=",
62 "path": "../mypackages", 62 "path": "../mypackages",
63 "type": "path" 63 "type": "path"
64 }, 64 },
diff --git a/flakes/mypackages/pkgs/webapps/roundcubemail/add_all.patch b/flakes/mypackages/pkgs/webapps/roundcubemail/add_all.patch
index ba651e2..e987fda 100644
--- a/flakes/mypackages/pkgs/webapps/roundcubemail/add_all.patch
+++ b/flakes/mypackages/pkgs/webapps/roundcubemail/add_all.patch
@@ -1,30 +1,60 @@
1diff --git a/program/include/rcmail_output_html.php b/program/include/rcmail_output_html.php 1diff --git a/program/actions/mail/index.php b/program/actions/mail/index.php
2index 0552b89c2..1b84e1b4e 100644 2--- a/program/actions/mail/index.php 1970-01-01 01:00:01.000000000 +0100
3--- a/program/include/rcmail_output_html.php 3+++ b/program/actions/mail/index.php 2024-08-10 01:49:10.362367233 +0200
4+++ b/program/include/rcmail_output_html.php 4@@ -146,7 +146,7 @@
5@@ -1013,13 +1013,13 @@ EOF; 5 'copy', 'move', 'quota', 'replyall', 'replylist', 'stillsearching',
6 // use minified file if exists (not in development mode) 6 'flagged', 'unflagged', 'unread', 'deleted', 'replied', 'forwarded',
7 if (!$this->devel_mode && !preg_match('/\.min\.' . $ext . '$/', $file)) { 7 'priority', 'withattachment', 'fileuploaderror', 'mark', 'markallread',
8 $minified_file = substr($file, 0, strlen($ext) * -1) . 'min.' . $ext; 8- 'folders-cur', 'folders-sub', 'folders-all', 'cancel', 'bounce', 'bouncemsg',
9- if ($fs = @filemtime($this->assets_dir . $minified_file)) { 9+ 'folders-cur', 'folders-sub', 'folders-allsubscribed', 'folders-all', 'cancel', 'bounce', 'bouncemsg',
10- return $minified_file . '?s=' . $fs; 10 'sendingmessage');
11+ if ($fs = @md5_file($this->assets_dir . $minified_file)) {
12+ return $minified_file . '?s=' . substr($fs, 0, 6);
13 } 11 }
14 } 12 }
13diff --git a/program/actions/mail/search.php b/program/actions/mail/search.php
14--- a/program/actions/mail/search.php 1970-01-01 01:00:01.000000000 +0100
15+++ b/program/actions/mail/search.php 2024-08-10 01:53:20.152011854 +0200
16@@ -83,6 +83,10 @@
15 17
16- if ($fs = @filemtime($this->assets_dir . $file)) { 18 // search all, current or subfolders folders
17- $file .= '?s=' . $fs; 19 if ($scope == 'all') {
18+ if ($fs = @md5_file($this->assets_dir . $file)) { 20+ $mboxes = $RCMAIL->storage->list_folders('', '*', 'mail', null, true);
19+ $file .= '?s=' . substr($fs, 0, 6); 21+ natcasesort($mboxes); // we want natural alphabetic sorting of folders in the result set
22+ }
23+ else if ($scope == 'allsubscribed') {
24 $mboxes = $rcmail->storage->list_folders_subscribed('', '*', 'mail', null, true);
25 // we want natural alphabetic sorting of folders in the result set
26 natcasesort($mboxes);
27@@ -93,7 +97,7 @@
28 array_unshift($mboxes, $mbox);
29 }
30
31- if ($scope != 'all') {
32+ if ($scope != 'all' && $scope != 'allsubscribed') {
33 // Remember current folder, it can change in meantime (plugins)
34 // but we need it to e.g. recognize Sent folder to handle From/To column later
35 $rcmail->output->set_env('mailbox', $mbox);
36@@ -158,7 +162,7 @@
37 $rcmail->output->show_message('searchnomatch', 'notice');
38 $rcmail->output->set_env('multifolder_listing', isset($result) ? !empty($result->multi) : false);
39
40- if (isset($result) && !empty($result->multi) && $scope == 'all') {
41+ if (isset($result) && !empty($result->multi) && ($scope == 'all' || $scope == 'allsubscribed')) {
42 $rcmail->output->command('select_folder', '');
43 }
20 } 44 }
45@@ -266,7 +270,7 @@
46 }
47
48 // save search modifiers for the current folder to user prefs
49- if ($scope != 'all') {
50+ if ($scope != 'all' && $scope != 'allsubscribed') {
51 $search_mods = self::search_mods();
52 $search_mods_value = array_fill_keys(array_keys($subject), 1);
21 53
22 return $file;
23diff --git a/program/js/app.js b/program/js/app.js 54diff --git a/program/js/app.js b/program/js/app.js
24index 2094b7b7b..06fe96a80 100644 55--- a/program/js/app.js 1970-01-01 01:00:01.000000000 +0100
25--- a/program/js/app.js 56+++ b/program/js/app.js 2024-08-10 01:44:57.834696269 +0200
26+++ b/program/js/app.js 57@@ -2311,6 +2311,9 @@
27@@ -2277,6 +2277,9 @@ function rcube_webmail()
28 } 58 }
29 59
30 tree += '<span id="msgicn'+row.id+'" class="'+css_class+status_class+'" title="'+status_label+'"></span>'; 60 tree += '<span id="msgicn'+row.id+'" class="'+css_class+status_class+'" title="'+status_label+'"></span>';
@@ -35,10 +65,9 @@ index 2094b7b7b..06fe96a80 100644
35 65
36 // build subject link 66 // build subject link
37diff --git a/program/localization/en_CA/labels.inc b/program/localization/en_CA/labels.inc 67diff --git a/program/localization/en_CA/labels.inc b/program/localization/en_CA/labels.inc
38index 03c1c8e11..8d67a49ac 100644 68--- a/program/localization/en_CA/labels.inc 1970-01-01 01:00:01.000000000 +0100
39--- a/program/localization/en_CA/labels.inc 69+++ b/program/localization/en_CA/labels.inc 2024-08-10 01:46:39.151767483 +0200
40+++ b/program/localization/en_CA/labels.inc 70@@ -128,6 +128,7 @@
41@@ -128,6 +128,7 @@ $labels['markunread'] = 'As unread';
42 $labels['markflagged'] = 'As flagged'; 71 $labels['markflagged'] = 'As flagged';
43 $labels['markunflagged'] = 'As unflagged'; 72 $labels['markunflagged'] = 'As unflagged';
44 $labels['moreactions'] = 'More actions...'; 73 $labels['moreactions'] = 'More actions...';
@@ -46,7 +75,7 @@ index 03c1c8e11..8d67a49ac 100644
46 $labels['folders-all'] = 'All folders'; 75 $labels['folders-all'] = 'All folders';
47 $labels['more'] = 'More'; 76 $labels['more'] = 'More';
48 $labels['back'] = 'Back'; 77 $labels['back'] = 'Back';
49@@ -184,6 +185,7 @@ $labels['namex'] = 'Name'; 78@@ -184,6 +185,7 @@
50 $labels['searchscope'] = 'Scope'; 79 $labels['searchscope'] = 'Scope';
51 $labels['currentfolder'] = 'Current folder'; 80 $labels['currentfolder'] = 'Current folder';
52 $labels['subfolders'] = 'This and subfolders'; 81 $labels['subfolders'] = 'This and subfolders';
@@ -55,10 +84,9 @@ index 03c1c8e11..8d67a49ac 100644
55 $labels['openinextwin'] = 'Open in new window'; 84 $labels['openinextwin'] = 'Open in new window';
56 $labels['emlsave'] = 'Download (.eml)'; 85 $labels['emlsave'] = 'Download (.eml)';
57diff --git a/program/localization/en_GB/labels.inc b/program/localization/en_GB/labels.inc 86diff --git a/program/localization/en_GB/labels.inc b/program/localization/en_GB/labels.inc
58index a442965de..b5b4839e3 100644 87--- a/program/localization/en_GB/labels.inc 1970-01-01 01:00:01.000000000 +0100
59--- a/program/localization/en_GB/labels.inc 88+++ b/program/localization/en_GB/labels.inc 2024-08-10 01:47:14.141137558 +0200
60+++ b/program/localization/en_GB/labels.inc 89@@ -139,6 +139,7 @@
61@@ -135,6 +135,7 @@ $labels['moreactions'] = 'More actions...';
62 $labels['markallread'] = 'Mark all as read'; 90 $labels['markallread'] = 'Mark all as read';
63 $labels['folders-cur'] = 'Selected folder only'; 91 $labels['folders-cur'] = 'Selected folder only';
64 $labels['folders-sub'] = 'Selected folder and its subfolders'; 92 $labels['folders-sub'] = 'Selected folder and its subfolders';
@@ -66,7 +94,7 @@ index a442965de..b5b4839e3 100644
66 $labels['folders-all'] = 'All folders'; 94 $labels['folders-all'] = 'All folders';
67 $labels['more'] = 'More'; 95 $labels['more'] = 'More';
68 $labels['back'] = 'Back'; 96 $labels['back'] = 'Back';
69@@ -221,6 +222,7 @@ $labels['namex'] = 'Name'; 97@@ -225,6 +226,7 @@
70 $labels['searchscope'] = 'Scope'; 98 $labels['searchscope'] = 'Scope';
71 $labels['currentfolder'] = 'Current folder'; 99 $labels['currentfolder'] = 'Current folder';
72 $labels['subfolders'] = 'This and subfolders'; 100 $labels['subfolders'] = 'This and subfolders';
@@ -75,10 +103,9 @@ index a442965de..b5b4839e3 100644
75 $labels['searchinterval-1W'] = 'older than a week'; 103 $labels['searchinterval-1W'] = 'older than a week';
76 $labels['searchinterval-1M'] = 'older than a month'; 104 $labels['searchinterval-1M'] = 'older than a month';
77diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc 105diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc
78index 2e8ec8009..c7736557f 100644 106--- a/program/localization/en_US/labels.inc 1970-01-01 01:00:01.000000000 +0100
79--- a/program/localization/en_US/labels.inc 107+++ b/program/localization/en_US/labels.inc 2024-08-10 01:47:40.749419031 +0200
80+++ b/program/localization/en_US/labels.inc 108@@ -162,6 +162,7 @@
81@@ -158,6 +158,7 @@ $labels['moreactions'] = 'More actions...';
82 $labels['markallread'] = 'Mark all as read'; 109 $labels['markallread'] = 'Mark all as read';
83 $labels['folders-cur'] = 'Selected folder only'; 110 $labels['folders-cur'] = 'Selected folder only';
84 $labels['folders-sub'] = 'Selected folder and its subfolders'; 111 $labels['folders-sub'] = 'Selected folder and its subfolders';
@@ -86,7 +113,7 @@ index 2e8ec8009..c7736557f 100644
86 $labels['folders-all'] = 'All folders'; 113 $labels['folders-all'] = 'All folders';
87 $labels['more'] = 'More'; 114 $labels['more'] = 'More';
88 $labels['back'] = 'Back'; 115 $labels['back'] = 'Back';
89@@ -249,6 +250,7 @@ $labels['namex'] = 'Name'; 116@@ -253,6 +254,7 @@
90 $labels['searchscope'] = 'Scope'; 117 $labels['searchscope'] = 'Scope';
91 $labels['currentfolder'] = 'Current folder'; 118 $labels['currentfolder'] = 'Current folder';
92 $labels['subfolders'] = 'This and subfolders'; 119 $labels['subfolders'] = 'This and subfolders';
@@ -95,10 +122,9 @@ index 2e8ec8009..c7736557f 100644
95 $labels['searchinterval-1W'] = 'older than a week'; 122 $labels['searchinterval-1W'] = 'older than a week';
96 $labels['searchinterval-1M'] = 'older than a month'; 123 $labels['searchinterval-1M'] = 'older than a month';
97diff --git a/program/localization/fr_FR/labels.inc b/program/localization/fr_FR/labels.inc 124diff --git a/program/localization/fr_FR/labels.inc b/program/localization/fr_FR/labels.inc
98index 6db44f95c..ad83e15d8 100644 125--- a/program/localization/fr_FR/labels.inc 1970-01-01 01:00:01.000000000 +0100
99--- a/program/localization/fr_FR/labels.inc 126+++ b/program/localization/fr_FR/labels.inc 2024-08-10 01:48:22.494860699 +0200
100+++ b/program/localization/fr_FR/labels.inc 127@@ -139,6 +139,7 @@
101@@ -135,6 +135,7 @@ $labels['moreactions'] = 'Plus d’actions…';
102 $labels['markallread'] = 'Tout marquer comme lu'; 128 $labels['markallread'] = 'Tout marquer comme lu';
103 $labels['folders-cur'] = 'Dossier sélectionné seulement'; 129 $labels['folders-cur'] = 'Dossier sélectionné seulement';
104 $labels['folders-sub'] = 'Dossier sélectionné et ses sous-dossiers'; 130 $labels['folders-sub'] = 'Dossier sélectionné et ses sous-dossiers';
@@ -106,7 +132,7 @@ index 6db44f95c..ad83e15d8 100644
106 $labels['folders-all'] = 'Tous les dossiers'; 132 $labels['folders-all'] = 'Tous les dossiers';
107 $labels['more'] = 'Plus'; 133 $labels['more'] = 'Plus';
108 $labels['back'] = 'Retour'; 134 $labels['back'] = 'Retour';
109@@ -221,6 +222,7 @@ $labels['namex'] = 'Nom'; 135@@ -225,6 +226,7 @@
110 $labels['searchscope'] = 'Portée'; 136 $labels['searchscope'] = 'Portée';
111 $labels['currentfolder'] = 'Répertoire actuel'; 137 $labels['currentfolder'] = 'Répertoire actuel';
112 $labels['subfolders'] = 'Ceci et les sous-dossiers'; 138 $labels['subfolders'] = 'Ceci et les sous-dossiers';
@@ -114,96 +140,14 @@ index 6db44f95c..ad83e15d8 100644
114 $labels['allfolders'] = 'Tous les dossiers'; 140 $labels['allfolders'] = 'Tous les dossiers';
115 $labels['searchinterval-1W'] = 'plus d’une semaine'; 141 $labels['searchinterval-1W'] = 'plus d’une semaine';
116 $labels['searchinterval-1M'] = 'plus d’un mois'; 142 $labels['searchinterval-1M'] = 'plus d’un mois';
117diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
118index 8e0c642f6..ac79780e0 100644
119--- a/program/steps/mail/func.inc
120+++ b/program/steps/mail/func.inc
121@@ -110,8 +110,8 @@ if (empty($RCMAIL->action) || $RCMAIL->action == 'list') {
122 'copy', 'move', 'quota', 'replyall', 'replylist', 'stillsearching',
123 'flagged', 'unflagged', 'unread', 'deleted', 'replied', 'forwarded',
124 'priority', 'withattachment', 'fileuploaderror', 'mark', 'markallread',
125- 'folders-cur', 'folders-sub', 'folders-all', 'cancel', 'bounce', 'bouncemsg',
126- 'sendingmessage');
127+ 'folders-cur', 'folders-sub', 'folders-allsubscribed', 'folder-all',
128+ 'cancel', 'bounce', 'bouncemsg', 'sendingmessage');
129 }
130 }
131
132diff --git a/program/steps/mail/search.inc b/program/steps/mail/search.inc
133index f60528835..836a715b0 100644
134--- a/program/steps/mail/search.inc
135+++ b/program/steps/mail/search.inc
136@@ -86,7 +86,7 @@ else if (strlen(trim($str))) {
137 }
138
139 // save search modifiers for the current folder to user prefs
140- $mkey = $scope == 'all' ? '*' : $mbox;
141+ $mkey = ($scope == 'all' || $scope == 'allsubscribed') ? '*' : $mbox;
142 $search_mods = rcmail_search_mods();
143 $search_mods[$mkey] = array_fill_keys(array_keys($subject), 1);
144
145@@ -124,6 +124,10 @@ if (!empty($continue) && isset($_SESSION['search']) && $_SESSION['search_request
146 if ($search_str) {
147 // search all, current or subfolders folders
148 if ($scope == 'all') {
149+ $mboxes = $RCMAIL->storage->list_folders('', '*', 'mail', null, true);
150+ natcasesort($mboxes); // we want natural alphabetic sorting of folders in the result set
151+ }
152+ else if ($scope == 'allsubscribed') {
153 $mboxes = $RCMAIL->storage->list_folders_subscribed('', '*', 'mail', null, true);
154 natcasesort($mboxes); // we want natural alphabetic sorting of folders in the result set
155 }
156@@ -133,7 +137,7 @@ if ($search_str) {
157 array_unshift($mboxes, $mbox);
158 }
159
160- if ($scope != 'all') {
161+ if ($scope != 'all' && $scope != 'allsubscribed') {
162 // Remember current folder, it can change in meantime (plugins)
163 // but we need it to e.g. recognize Sent folder to handle From/To column later
164 $RCMAIL->output->set_env('mailbox', $mbox);
165@@ -194,7 +198,7 @@ else {
166 $count = 0;
167 $OUTPUT->show_message('searchnomatch', 'notice');
168 $OUTPUT->set_env('multifolder_listing', (bool)$result->multi);
169- if ($result->multi && $scope == 'all') {
170+ if ($result->multi && ($scope == 'all' || $scope == 'allsubscribed')) {
171 $OUTPUT->command('select_folder', '');
172 }
173 }
174diff --git a/skins/classic/templates/mail.html b/skins/classic/templates/mail.html
175index 666adf606..23d12a275 100644
176--- a/skins/classic/templates/mail.html
177+++ b/skins/classic/templates/mail.html
178@@ -106,6 +106,7 @@
179 <li><label class="comment"><roundcube:label name="searchscope" /></label></li>
180 <li><label><input type="radio" name="s_scope" value="base" id="s_scope_base" onclick="rcmail.set_searchscope(this.value)" /> <span><roundcube:label name="currentfolder" /></span></label></li>
181 <li><label><input type="radio" name="s_scope" value="sub" id="s_scope_sub" onclick="rcmail.set_searchscope(this.value)" /> <span><roundcube:label name="subfolders" /></span></label></li>
182+ <li><label><input type="radio" name="s_scope" value="allsubscribed" id="s_scope_allsubscribed" onclick="rcmail.set_searchscope(this.value)" /> <span><roundcube:label name="allsubscribedfolders" /></span></label></li>
183 <li><label><input type="radio" name="s_scope" value="all" id="s_scope_all" onclick="rcmail.set_searchscope(this.value)" /> <span><roundcube:label name="allfolders" /></span></label></li>
184 </ul>
185 </div>
186diff --git a/skins/elastic/templates/mail.html b/skins/elastic/templates/mail.html 143diff --git a/skins/elastic/templates/mail.html b/skins/elastic/templates/mail.html
187index 51dbfcd30..4c2281281 100644 144--- a/skins/elastic/templates/mail.html 1970-01-01 01:00:01.000000000 +0100
188--- a/skins/elastic/templates/mail.html 145+++ b/skins/elastic/templates/mail.html 2024-08-10 01:55:08.812162821 +0200
189+++ b/skins/elastic/templates/mail.html 146@@ -91,6 +91,7 @@
190@@ -77,6 +77,7 @@ 147 <select name="s_scope" id="s_scope" class="custom-select">
191 <select name="s_scope" id="s_scope">
192 <option value="base"><roundcube:label name="currentfolder" /></option> 148 <option value="base"><roundcube:label name="currentfolder" /></option>
193 <option value="sub"><roundcube:label name="subfolders" /></option> 149 <option value="sub"><roundcube:label name="subfolders" /></option>
194+ <option value="allsubscribed"><roundcube:label name="allsubscribedfolders" /></option> 150+ <option value="allsubscribed"><roundcube:label name="allsubscribedfolders" /></option>
195 <option value="all"><roundcube:label name="allfolders" /></option> 151 <option value="all"><roundcube:label name="allfolders" /></option>
196 </select> 152 </select>
197 </div> 153 </div>
198diff --git a/skins/larry/templates/mail.html b/skins/larry/templates/mail.html
199index 5ef0bc211..e0e8280ad 100644
200--- a/skins/larry/templates/mail.html
201+++ b/skins/larry/templates/mail.html
202@@ -56,6 +56,7 @@
203 <li role="separator" class="separator"><label><roundcube:label name="searchscope" /></label></li>
204 <li role="menuitem"><label><input type="radio" name="s_scope" value="base" id="s_scope_base" onclick="UI.set_searchscope(this)" /> <span><roundcube:label name="currentfolder" /></span></label></li>
205 <li role="menuitem"><label><input type="radio" name="s_scope" value="sub" id="s_scope_sub" onclick="UI.set_searchscope(this)" /> <span><roundcube:label name="subfolders" /></span></label></li>
206+ <li role="menuitem"><label><input type="radio" name="s_scope" value="allsubscribed" id="s_scope_allsubscribed" onclick="UI.set_searchscope(this)" /> <span><roundcube:label name="allsubscribedfolders" /></span></label></li>
207 <li role="menuitem"><label><input type="radio" name="s_scope" value="all" id="s_scope_all" onclick="UI.set_searchscope(this)" /> <span><roundcube:label name="allfolders" /></span></label></li>
208 </ul>
209 <div class="buttons"><a class="button" href="#" onclick="if (rcmail.command('search')) UI.show_popup('searchmenu',false)"><roundcube:label name="search" /></a></div>
diff --git a/flakes/mypackages/pkgs/webapps/roundcubemail/default.nix b/flakes/mypackages/pkgs/webapps/roundcubemail/default.nix
index a786e86..f83e61b 100644
--- a/flakes/mypackages/pkgs/webapps/roundcubemail/default.nix
+++ b/flakes/mypackages/pkgs/webapps/roundcubemail/default.nix
@@ -1,6 +1,6 @@
1{ varDir ? "/var/lib/roundcubemail" 1{ varDir ? "/var/lib/roundcubemail"
2, roundcube_config ? "/etc/roundcube/config.php" 2, roundcube_config ? "/etc/roundcube/config.php"
3, stdenv, fetchurl, jre, unzip, lib, callPackage }: 3, stdenv, fetchurl, which, nodePackages, lib, callPackage }:
4let 4let
5 defaultInstall = '' 5 defaultInstall = ''
6 mkdir -p $out 6 mkdir -p $out
@@ -52,22 +52,20 @@ let
52 passthru = toPassthru newRoundcube pkg.plugins (pkg.skins ++ skins); 52 passthru = toPassthru newRoundcube pkg.plugins (pkg.skins ++ skins);
53 }); 53 });
54 in newRoundcube; 54 in newRoundcube;
55 shrinker = fetchurl {
56 url = "https://dl.google.com/closure-compiler/compiler-20200719.zip";
57 sha256 = "0j46y9ack2yq67naca6nfysbmyilwjlkl29dbswidf1lq09yhhj3";
58 };
59 package = stdenv.mkDerivation rec { 55 package = stdenv.mkDerivation rec {
60 version = "1.4.15"; 56 version = "1.6.8";
61 name = "roundcubemail-${version}"; 57 name = "roundcubemail-${version}";
62 src= fetchurl { 58 src= fetchurl {
63 url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/${name}-complete.tar.gz"; 59 url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/${name}-complete.tar.gz";
64 sha256 = "sha256-0CRVGmPCjMOUPEELpWk93TifchXUbzhUvS55IOgaAh8="; 60 sha256 = "sha256-hGi+AgSnNMV0re9L4BV4x9xPq5wv40ADvzQaK9IO/So=";
65 }; 61 };
66 patches = [ ./add_all.patch ]; # This patch includes js modification which requires to re-run the jsshrink below 62 patches = [
67 buildInputs = [ unzip jre ]; 63 ./add_all.patch # This patch includes js modification which requires to re-run the jsshrink below
64 ./md5.patch
65 ];
66 buildInputs = [ which nodePackages.uglify-js ];
68 buildPhase = '' 67 buildPhase = ''
69 mkdir -p /tmp 68 sed -i -e "s/uglify-js/uglifyjs/g" ./bin/jsshrink.sh
70 unzip -p "${shrinker}" "*.jar" > "/tmp/compiler.jar"
71 ./bin/jsshrink.sh 69 ./bin/jsshrink.sh
72 sed -i \ 70 sed -i \
73 -e "s|RCUBE_INSTALL_PATH . 'temp.*|'${varDir}/cache';|" \ 71 -e "s|RCUBE_INSTALL_PATH . 'temp.*|'${varDir}/cache';|" \
diff --git a/flakes/mypackages/pkgs/webapps/roundcubemail/md5.patch b/flakes/mypackages/pkgs/webapps/roundcubemail/md5.patch
new file mode 100644
index 0000000..36b30c2
--- /dev/null
+++ b/flakes/mypackages/pkgs/webapps/roundcubemail/md5.patch
@@ -0,0 +1,22 @@
1diff --git a/program/include/rcmail_output_html.php b/program/include/rcmail_output_html.php
2index 0552b89c2..1b84e1b4e 100644
3--- a/program/include/rcmail_output_html.php
4+++ b/program/include/rcmail_output_html.php
5@@ -1013,13 +1013,13 @@ EOF;
6 // use minified file if exists (not in development mode)
7 if (!$this->devel_mode && !preg_match('/\.min\.' . $ext . '$/', $file)) {
8 $minified_file = substr($file, 0, strlen($ext) * -1) . 'min.' . $ext;
9- if ($fs = @filemtime($this->assets_dir . $minified_file)) {
10- return $minified_file . '?s=' . $fs;
11+ if ($fs = @md5_file($this->assets_dir . $minified_file)) {
12+ return $minified_file . '?s=' . substr($fs, 0, 6);
13 }
14 }
15
16- if ($fs = @filemtime($this->assets_dir . $file)) {
17- $file .= '?s=' . $fs;
18+ if ($fs = @md5_file($this->assets_dir . $file)) {
19+ $file .= '?s=' . substr($fs, 0, 6);
20 }
21
22 return $file;
diff --git a/flakes/mypackages/pkgs/webapps/roundcubemail/plugins/carddav/default.nix b/flakes/mypackages/pkgs/webapps/roundcubemail/plugins/carddav/default.nix
index ad6856b..a9e7821 100644
--- a/flakes/mypackages/pkgs/webapps/roundcubemail/plugins/carddav/default.nix
+++ b/flakes/mypackages/pkgs/webapps/roundcubemail/plugins/carddav/default.nix
@@ -1,7 +1,7 @@
1{ buildPlugin }: 1{ buildPlugin }:
2buildPlugin rec { 2buildPlugin rec {
3 appName = "carddav"; 3 appName = "carddav";
4 version = "3.0.3"; 4 version = "5.1.0";
5 url = "https://github.com/blind-coder/rcmcarddav/releases/download/v${version}/${appName}-${version}.tar.bz2"; 5 url = "https://github.com/mstilkerich/rcmcarddav/releases/download/v${version}/${appName}-v${version}.tar.gz";
6 sha256 = "0cf5rnqkhhag2vdy808zfpr4l5586fn43nvcia8ac1ha58azrxal"; 6 sha256 = "sha256-lmeTr1i1oO65IQcry6NRxL1iEi+QxW0K6r9dyv/wJis=";
7} 7}
diff --git a/flakes/mypackages/pkgs/webapps/roundcubemail/plugins/contextmenu/default.nix b/flakes/mypackages/pkgs/webapps/roundcubemail/plugins/contextmenu/default.nix
index 34a43a7..9e56784 100644
--- a/flakes/mypackages/pkgs/webapps/roundcubemail/plugins/contextmenu/default.nix
+++ b/flakes/mypackages/pkgs/webapps/roundcubemail/plugins/contextmenu/default.nix
@@ -1,7 +1,7 @@
1{ buildPlugin }: 1{ buildPlugin }:
2buildPlugin rec { 2buildPlugin rec {
3 appName = "contextmenu"; 3 appName = "contextmenu";
4 version = "3.2"; 4 version = "3.3.1";
5 url = "https://github.com/johndoh/roundcube-${appName}/archive/${version}.tar.gz"; 5 url = "https://github.com/johndoh/roundcube-${appName}/archive/${version}.tar.gz";
6 sha256 = "1j7qns42bvgwav8d5n8g16iajyrhydd76hgil8625f3xyjbv4mx0"; 6 sha256 = "sha256-Y4IPe6EWvfU3pRq1MBTMMDxF9GXj/x4xDTMz5klAwLs=";
7} 7}
diff --git a/flakes/mypackages/pkgs/webapps/roundcubemail/plugins/contextmenu_folder/default.nix b/flakes/mypackages/pkgs/webapps/roundcubemail/plugins/contextmenu_folder/default.nix
index e5cb46d..d3c3683 100644
--- a/flakes/mypackages/pkgs/webapps/roundcubemail/plugins/contextmenu_folder/default.nix
+++ b/flakes/mypackages/pkgs/webapps/roundcubemail/plugins/contextmenu_folder/default.nix
@@ -1,7 +1,7 @@
1{ buildPlugin }: 1{ buildPlugin }:
2buildPlugin rec { 2buildPlugin rec {
3 appName = "contextmenu_folder"; 3 appName = "contextmenu_folder";
4 version = "1.3.3"; 4 version = "2.0.2";
5 url = "https://github.com/random-cuber/${appName}/archive/${version}.tar.gz"; 5 url = "https://github.com/random-cuber/${appName}/archive/${version}.tar.gz";
6 sha256 = "1ngfws1v8qrpa52rjh7kirc98alchk2vbqwra86h00agyjjlcc57"; 6 sha256 = "sha256-P/T7EZPKzcz1R5iDZU+V+5sWnli9OCwSziWm8oPuuFM=";
7} 7}
diff --git a/flakes/mypackages/pkgs/webapps/roundcubemail/plugins/ident_switch/default.nix b/flakes/mypackages/pkgs/webapps/roundcubemail/plugins/ident_switch/default.nix
index 3e10fee..14815f6 100644
--- a/flakes/mypackages/pkgs/webapps/roundcubemail/plugins/ident_switch/default.nix
+++ b/flakes/mypackages/pkgs/webapps/roundcubemail/plugins/ident_switch/default.nix
@@ -1,7 +1,7 @@
1{ buildPlugin }: 1{ buildPlugin }:
2buildPlugin rec { 2buildPlugin rec {
3 appName = "ident_switch"; 3 appName = "ident_switch";
4 version = "4.2"; 4 version = "4.4.2";
5 url = "https://bitbucket.org/BoresExpress/${appName}/get/${version}.tar.gz"; 5 url = "https://bitbucket.org/BoresExpress/${appName}/get/${version}.tar.gz";
6 sha256 = "0rf2krjsnly4i0mzgsbx09xckr3p9a9dzxf8qq4lkyng1a7dvjkq"; 6 sha256 = "sha256-+3rus8+2PU1E1/8U6KeJJNm6JpJq7elyL07BDR0UsZg=";
7} 7}
diff --git a/flakes/mypackages/pkgs/webapps/roundcubemail/plugins/thunderbird_labels/default.nix b/flakes/mypackages/pkgs/webapps/roundcubemail/plugins/thunderbird_labels/default.nix
index b67f16a..4e1ab51 100644
--- a/flakes/mypackages/pkgs/webapps/roundcubemail/plugins/thunderbird_labels/default.nix
+++ b/flakes/mypackages/pkgs/webapps/roundcubemail/plugins/thunderbird_labels/default.nix
@@ -1,7 +1,7 @@
1{ buildPlugin }: 1{ buildPlugin }:
2buildPlugin rec { 2buildPlugin rec {
3 appName = "thunderbird_labels"; 3 appName = "thunderbird_labels";
4 version = "v1.4.2"; 4 version = "v1.6.1";
5 url = "https://github.com/mike-kfed/roundcube-${appName}/archive/${version}.tar.gz"; 5 url = "https://github.com/mike-kfed/roundcube-${appName}/archive/${version}.tar.gz";
6 sha256 = "00dqqlq6m8a6dwynp6gwfimc10anbs8kh0qdy8xvq2l06hk6jxyc"; 6 sha256 = "sha256-2zVGoIMwO+zg3v/MZmGdvc7Qyrcyyf6Hua0fRc7ewuU=";
7} 7}
diff --git a/flakes/mypackages/pkgs/webapps/spip/default.nix b/flakes/mypackages/pkgs/webapps/spip/default.nix
index 3248066..9bf12be 100644
--- a/flakes/mypackages/pkgs/webapps/spip/default.nix
+++ b/flakes/mypackages/pkgs/webapps/spip/default.nix
@@ -7,10 +7,10 @@
7let 7let
8 app = stdenv.mkDerivation rec { 8 app = stdenv.mkDerivation rec {
9 name = "${siteName}-${environment}-spip-${version}"; 9 name = "${siteName}-${environment}-spip-${version}";
10 version = "4.2.9"; 10 version = "4.3.2";
11 src = fetchzip { 11 src = fetchzip {
12 url = "https://files.spip.net/spip/archives/spip-v${version}.zip"; 12 url = "https://files.spip.net/spip/archives/spip-v${version}.zip";
13 sha256 = "sha256-eHQ0q6f8/bFtuxn5LvAtKp3OaDGRCdVUh3kug8iBIbA="; 13 sha256 = "sha256-H376YAQrJYJLKSuM8z5YZfCvs6oC7TVWduCq0R3Zn4k=";
14 stripRoot = false; 14 stripRoot = false;
15 }; 15 };
16 paches = lib.optionals ldap [ ./spip_ldap_patch.patch ]; 16 paches = lib.optionals ldap [ ./spip_ldap_patch.patch ];
diff --git a/flakes/private/system/flake.lock b/flakes/private/system/flake.lock
index c6362c5..a675105 100644
--- a/flakes/private/system/flake.lock
+++ b/flakes/private/system/flake.lock
@@ -69,7 +69,7 @@
69 }, 69 },
70 "locked": { 70 "locked": {
71 "lastModified": 1, 71 "lastModified": 1,
72 "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", 72 "narHash": "sha256-r3UkR0dalaU+FjmDcrMkXeT3BOJryAVzX7Sp8pihjno=",
73 "path": "../../mypackages", 73 "path": "../../mypackages",
74 "type": "path" 74 "type": "path"
75 }, 75 },
diff --git a/flakes/private/system/flake.nix b/flakes/private/system/flake.nix
index 6045fd4..9010140 100644
--- a/flakes/private/system/flake.nix
+++ b/flakes/private/system/flake.nix
@@ -65,6 +65,7 @@
65 users.users.acme.uid = myuids.lib.uids.acme; 65 users.users.acme.uid = myuids.lib.uids.acme;
66 environment.systemPackages = [ 66 environment.systemPackages = [
67 pkgs.inetutils 67 pkgs.inetutils
68 pkgs.btop
68 pkgs.htop 69 pkgs.htop
69 pkgs.iftop 70 pkgs.iftop
70 pkgs.bind.dnsutils 71 pkgs.bind.dnsutils
diff --git a/flakes/surfer/flake.lock b/flakes/surfer/flake.lock
index 8ebbf92..72af2e4 100644
--- a/flakes/surfer/flake.lock
+++ b/flakes/surfer/flake.lock
@@ -41,7 +41,7 @@
41 }, 41 },
42 "locked": { 42 "locked": {
43 "lastModified": 1, 43 "lastModified": 1,
44 "narHash": "sha256-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", 44 "narHash": "sha256-r3UkR0dalaU+FjmDcrMkXeT3BOJryAVzX7Sp8pihjno=",
45 "path": "../mypackages", 45 "path": "../mypackages",
46 "type": "path" 46 "type": "path"
47 }, 47 },
diff --git a/systems/backup-2/flake.lock b/systems/backup-2/flake.lock
index dedbfb4..2eee849 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-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", 428 "narHash": "sha256-r3UkR0dalaU+FjmDcrMkXeT3BOJryAVzX7Sp8pihjno=",
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-5cM87LAHjrWoZRc2QbM6Xu9klzMNBpREjz6sWqp+hFA=", 1107 "narHash": "sha256-uW8mX4yKNyf1lysk3yNW54RILG+JfJ9KQ10dAAge4Hk=",
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 436b4bc..be2ce96 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-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", 246 "narHash": "sha256-r3UkR0dalaU+FjmDcrMkXeT3BOJryAVzX7Sp8pihjno=",
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-5cM87LAHjrWoZRc2QbM6Xu9klzMNBpREjz6sWqp+hFA=", 602 "narHash": "sha256-uW8mX4yKNyf1lysk3yNW54RILG+JfJ9KQ10dAAge4Hk=",
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 9d6c296..ac6307e 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-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", 816 "narHash": "sha256-r3UkR0dalaU+FjmDcrMkXeT3BOJryAVzX7Sp8pihjno=",
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-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", 833 "narHash": "sha256-r3UkR0dalaU+FjmDcrMkXeT3BOJryAVzX7Sp8pihjno=",
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-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", 850 "narHash": "sha256-r3UkR0dalaU+FjmDcrMkXeT3BOJryAVzX7Sp8pihjno=",
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-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", 867 "narHash": "sha256-r3UkR0dalaU+FjmDcrMkXeT3BOJryAVzX7Sp8pihjno=",
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-5cM87LAHjrWoZRc2QbM6Xu9klzMNBpREjz6sWqp+hFA=", 2156 "narHash": "sha256-uW8mX4yKNyf1lysk3yNW54RILG+JfJ9KQ10dAAge4Hk=",
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-2fWHwmMMILe0enrbMMgFoVH+3PysvSx1Oair4W2hgIw=", 2209 "narHash": "sha256-1uymFn5bZul+Rrnek5YdC2EtgllQlL48VAvQTBh7ao4=",
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-emS5jDCcLaK3/Hqk/2p6jQDxZfO1hPicMTblyVBD7EI=", 2251 "narHash": "sha256-0jKcrg+vVVhfPgfu0kPo4JtgdFXuP29usmgRoSmsX5U=",
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-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", 2332 "narHash": "sha256-r3UkR0dalaU+FjmDcrMkXeT3BOJryAVzX7Sp8pihjno=",
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-cR14yn0IbWNe98PAlV+MHO6ClQqeT5HztMeLawldtWs=", 2443 "narHash": "sha256-B37mhSriF+N+vwuXTL60SvgxMqIsdiAUsL48g1A6VRY=",
2444 "path": "../../flakes/surfer", 2444 "path": "../../flakes/surfer",
2445 "type": "path" 2445 "type": "path"
2446 }, 2446 },
diff --git a/systems/eldiron/websites/mail/default.nix b/systems/eldiron/websites/mail/default.nix
index 0a0342b..e212cd2 100644
--- a/systems/eldiron/websites/mail/default.nix
+++ b/systems/eldiron/websites/mail/default.nix
@@ -111,13 +111,13 @@ in
111 phpOptions = config.services.phpfpm.phpOptions + '' 111 phpOptions = config.services.phpfpm.phpOptions + ''
112 date.timezone = 'CET' 112 date.timezone = 'CET'
113 ''; 113 '';
114 phpPackage = pkgs.php72.withExtensions({ enabled, all }: enabled ++ [ all.imagick all.redis ]); 114 phpPackage = pkgs.php82.withExtensions({ enabled, all }: enabled ++ [ all.imagick all.redis ]);
115 }; 115 };
116 services.phpfpm.pools.rainloop = { 116 services.phpfpm.pools.rainloop = {
117 user = "wwwrun"; 117 user = "wwwrun";
118 group = "wwwrun"; 118 group = "wwwrun";
119 settings = rainloop.phpFpm.pool; 119 settings = rainloop.phpFpm.pool;
120 phpPackage = pkgs.php72.withExtensions({ enabled, all }: enabled ++ [ all.redis ]); 120 phpPackage = pkgs.php82.withExtensions({ enabled, all }: enabled ++ [ all.redis ]);
121 }; 121 };
122 system.activationScripts = { 122 system.activationScripts = {
123 roundcubemail = roundcubemail.activationScript; 123 roundcubemail = roundcubemail.activationScript;
diff --git a/systems/eldiron/websites/mail/roundcubemail.nix b/systems/eldiron/websites/mail/roundcubemail.nix
index 21a10fe..1db6c81 100644
--- a/systems/eldiron/websites/mail/roundcubemail.nix
+++ b/systems/eldiron/websites/mail/roundcubemail.nix
@@ -15,15 +15,16 @@ rec {
15 text = 15 text =
16 let 16 let
17 psql_url = with env.postgresql; "pgsql://${user}:${password}@unix(${socket}:${port})/${database}"; 17 psql_url = with env.postgresql; "pgsql://${user}:${password}@unix(${socket}:${port})/${database}";
18 mysql_postfix_url = with config.myEnv.mail.dovecot.mysql; "mysql://${user}:${password}@unix(${socket})/${database}";
18 in '' 19 in ''
19 <?php 20 <?php
20 $config['db_dsnw'] = '${psql_url}'; 21 $config['db_dsnw'] = '${psql_url}';
21 $config['default_host'] = 'ssl://imap.immae.eu'; 22 $config['imap_host'] = 'ssl://imap.immae.eu';
22 $config['username_domain'] = array( 23 $config['username_domain'] = array(
23 "imap.immae.eu" => "mail.immae.eu" 24 "imap.immae.eu" => "mail.immae.eu"
24 ); 25 );
25 $config['imap_conn_options'] = array("ssl" => array("verify_peer" => false)); 26 $config['imap_conn_options'] = array("ssl" => array("verify_peer" => false));
26 $config['smtp_server'] = 'tls://smtp.immae.eu'; 27 $config['smtp_host'] = 'tls://smtp.immae.eu';
27 $config['smtp_port'] = '587'; 28 $config['smtp_port'] = '587';
28 $config['managesieve_host'] = 'imap.immae.eu'; 29 $config['managesieve_host'] = 'imap.immae.eu';
29 $config['managesieve_port'] = '4190'; 30 $config['managesieve_port'] = '4190';
@@ -49,16 +50,22 @@ rec {
49 'markasjunk', 50 'markasjunk',
50 'managesieve', 51 'managesieve',
51 'newmail_notifier', 52 'newmail_notifier',
53 'reconnect',
52 'vcard_attachments', 54 'vcard_attachments',
53 'zipdownload', 55 'zipdownload',
56 'virtuser_query',
54 57
55 'automatic_addressbook',
56 'message_highlight', 58 'message_highlight',
57 'carddav', 59 'carddav',
60 // Intégré à roundcube 'automatic_addressbook',
58 // Ne marche pas ?: 'ident_switch', 61 // Ne marche pas ?: 'ident_switch',
59 // Ne marche pas ?: 'thunderbird_labels', 62 // Ne marche pas ?: 'thunderbird_labels',
60 ); 63 );
61 64
65 $config['virtuser_query_dsn'] = '${mysql_postfix_url}';
66 $config['virtuser_query'] = array(
67 "user" => "SELECT destination FROM forwardings WHERE ((regex = 1 AND '%m' REGEXP CONCAT('^',source,'$')) OR (regex = 0 AND source = '%m')) AND active = 1"
68 );
62 $config['language'] = 'fr_FR'; 69 $config['language'] = 'fr_FR';
63 70
64 $config['drafts_mbox'] = 'Drafts'; 71 $config['drafts_mbox'] = 'Drafts';
diff --git a/systems/monitoring-1/flake.lock b/systems/monitoring-1/flake.lock
index 5330b72..372338d 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-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", 316 "narHash": "sha256-r3UkR0dalaU+FjmDcrMkXeT3BOJryAVzX7Sp8pihjno=",
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-5cM87LAHjrWoZRc2QbM6Xu9klzMNBpREjz6sWqp+hFA=", 738 "narHash": "sha256-uW8mX4yKNyf1lysk3yNW54RILG+JfJ9KQ10dAAge4Hk=",
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 e96c9fa..5b56444 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-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", 294 "narHash": "sha256-r3UkR0dalaU+FjmDcrMkXeT3BOJryAVzX7Sp8pihjno=",
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-5cM87LAHjrWoZRc2QbM6Xu9klzMNBpREjz6sWqp+hFA=", 715 "narHash": "sha256-uW8mX4yKNyf1lysk3yNW54RILG+JfJ9KQ10dAAge4Hk=",
716 "path": "../../flakes/private/system", 716 "path": "../../flakes/private/system",
717 "type": "path" 717 "type": "path"
718 }, 718 },
diff --git a/systems/zoldene/flake.lock b/systems/zoldene/flake.lock
index 638d3a0..3407528 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-yHJid6Rpxa5pfKI81FfI0VZir9seZMHtLzjdvmt0FVw=", 196 "narHash": "sha256-r3UkR0dalaU+FjmDcrMkXeT3BOJryAVzX7Sp8pihjno=",
197 "path": "../../mypackages", 197 "path": "../../mypackages",
198 "type": "path" 198 "type": "path"
199 }, 199 },
@@ -455,7 +455,7 @@
455 }, 455 },
456 "locked": { 456 "locked": {
457 "lastModified": 1, 457 "lastModified": 1,
458 "narHash": "sha256-5cM87LAHjrWoZRc2QbM6Xu9klzMNBpREjz6sWqp+hFA=", 458 "narHash": "sha256-uW8mX4yKNyf1lysk3yNW54RILG+JfJ9KQ10dAAge4Hk=",
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 398465b..943d5f1 100644
--- a/systems/zoldene/logging.nix
+++ b/systems/zoldene/logging.nix
@@ -102,10 +102,7 @@ in
102 ingestion_burst_size_mb = 200; 102 ingestion_burst_size_mb = 200;
103 per_stream_rate_limit = "100MB"; 103 per_stream_rate_limit = "100MB";
104 per_stream_rate_limit_burst = "200MB"; 104 per_stream_rate_limit_burst = "200MB";
105 # Need to migrate to v13 schema 105 # Remove after 2024-07-08 see below
106 # MULTIPLE CONFIG ERRORS FOUND, PLEASE READ CAREFULLY
107 # CONFIG ERROR: schema v13 is required to store Structured Metadata and use native OTLP ingestion, your schema version is v11. Set `allow_structured_metadata: false` in the `limits_config` section or set the command line argument `-validation.allow-structured-metadata=false` and restart Loki. Then proceed to update to schema v13 or newer before re-enabling this config, search for 'Storage Schema' in the docs for the schema update procedure
108 # CONFIG ERROR: `tsdb` index type is required to store Structured Metadata and use native OTLP ingestion, your index type is `boltdb-shipper` (defined in the `store` parameter of the schema_config). Set `allow_structured_metadata: false` in the `limits_config` section or set the command line argument `-validation.allow-structured-metadata=false` and restart Loki. Then proceed to update the schema to use index type `tsdb` before re-enabling this config, search for 'Storage Schema' in the docs for the schema update procedure"
109 allow_structured_metadata = false; 106 allow_structured_metadata = false;
110 }; 107 };
111 108
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 01:32:43 +0000