From 49fee6918c32e5293622ad5217a27194af72365f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Mon, 10 Jun 2024 13:19:44 +0200 Subject: Fix shaarli tmp directory --- flakes/etherpad-lite/flake.lock | 2 +- flakes/flake.lock | 68 +++++++++++------------ flakes/grocy/flake.lock | 2 +- flakes/mypackages/pkgs/shaarli/shaarli_ldap.patch | 4 +- flakes/private/system/flake.lock | 2 +- flakes/surfer/flake.lock | 2 +- 6 files changed, 40 insertions(+), 40 deletions(-) (limited to 'flakes') diff --git a/flakes/etherpad-lite/flake.lock b/flakes/etherpad-lite/flake.lock index 11785c8..e3dc820 100644 --- a/flakes/etherpad-lite/flake.lock +++ b/flakes/etherpad-lite/flake.lock @@ -58,7 +58,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-jxTNlRKgwoM8H/HHeIkrssrrVLFIWZJqg0QwPuipZ6A=", + "narHash": "sha256-PPOh6hf0hakuHCBOgJok208Qc3xKpuwwxhHV2QQRbmA=", "path": "../mypackages", "type": "path" }, diff --git a/flakes/flake.lock b/flakes/flake.lock index 43c257e..cf0ef6c 100644 --- a/flakes/flake.lock +++ b/flakes/flake.lock @@ -3016,7 +3016,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-jxTNlRKgwoM8H/HHeIkrssrrVLFIWZJqg0QwPuipZ6A=", + "narHash": "sha256-PPOh6hf0hakuHCBOgJok208Qc3xKpuwwxhHV2QQRbmA=", "path": "../../mypackages", "type": "path" }, @@ -3033,7 +3033,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-jxTNlRKgwoM8H/HHeIkrssrrVLFIWZJqg0QwPuipZ6A=", + "narHash": "sha256-PPOh6hf0hakuHCBOgJok208Qc3xKpuwwxhHV2QQRbmA=", "path": "../mypackages", "type": "path" }, @@ -3050,7 +3050,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-jxTNlRKgwoM8H/HHeIkrssrrVLFIWZJqg0QwPuipZ6A=", + "narHash": "sha256-PPOh6hf0hakuHCBOgJok208Qc3xKpuwwxhHV2QQRbmA=", "path": "../mypackages", "type": "path" }, @@ -3067,7 +3067,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-jxTNlRKgwoM8H/HHeIkrssrrVLFIWZJqg0QwPuipZ6A=", + "narHash": "sha256-PPOh6hf0hakuHCBOgJok208Qc3xKpuwwxhHV2QQRbmA=", "path": "../../mypackages", "type": "path" }, @@ -3084,7 +3084,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-jxTNlRKgwoM8H/HHeIkrssrrVLFIWZJqg0QwPuipZ6A=", + "narHash": "sha256-PPOh6hf0hakuHCBOgJok208Qc3xKpuwwxhHV2QQRbmA=", "path": "../mypackages", "type": "path" }, @@ -3101,7 +3101,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-jxTNlRKgwoM8H/HHeIkrssrrVLFIWZJqg0QwPuipZ6A=", + "narHash": "sha256-PPOh6hf0hakuHCBOgJok208Qc3xKpuwwxhHV2QQRbmA=", "path": "../../mypackages", "type": "path" }, @@ -3118,7 +3118,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-jxTNlRKgwoM8H/HHeIkrssrrVLFIWZJqg0QwPuipZ6A=", + "narHash": "sha256-PPOh6hf0hakuHCBOgJok208Qc3xKpuwwxhHV2QQRbmA=", "path": "../../mypackages", "type": "path" }, @@ -3135,7 +3135,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-jxTNlRKgwoM8H/HHeIkrssrrVLFIWZJqg0QwPuipZ6A=", + "narHash": "sha256-PPOh6hf0hakuHCBOgJok208Qc3xKpuwwxhHV2QQRbmA=", "path": "../mypackages", "type": "path" }, @@ -3152,7 +3152,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-jxTNlRKgwoM8H/HHeIkrssrrVLFIWZJqg0QwPuipZ6A=", + "narHash": "sha256-PPOh6hf0hakuHCBOgJok208Qc3xKpuwwxhHV2QQRbmA=", "path": "../mypackages", "type": "path" }, @@ -3169,7 +3169,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-jxTNlRKgwoM8H/HHeIkrssrrVLFIWZJqg0QwPuipZ6A=", + "narHash": "sha256-PPOh6hf0hakuHCBOgJok208Qc3xKpuwwxhHV2QQRbmA=", "path": "../mypackages", "type": "path" }, @@ -3186,7 +3186,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-jxTNlRKgwoM8H/HHeIkrssrrVLFIWZJqg0QwPuipZ6A=", + "narHash": "sha256-PPOh6hf0hakuHCBOgJok208Qc3xKpuwwxhHV2QQRbmA=", "path": "../../mypackages", "type": "path" }, @@ -3203,7 +3203,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-jxTNlRKgwoM8H/HHeIkrssrrVLFIWZJqg0QwPuipZ6A=", + "narHash": "sha256-PPOh6hf0hakuHCBOgJok208Qc3xKpuwwxhHV2QQRbmA=", "path": "../../mypackages", "type": "path" }, @@ -3220,7 +3220,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-jxTNlRKgwoM8H/HHeIkrssrrVLFIWZJqg0QwPuipZ6A=", + "narHash": "sha256-PPOh6hf0hakuHCBOgJok208Qc3xKpuwwxhHV2QQRbmA=", "path": "../../mypackages", "type": "path" }, @@ -3753,7 +3753,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-tES2TmrQIYifZ/6Sdf2I1n7SPdckEJPRaDXsNNAHrbQ=", + "narHash": "sha256-IT0Vt2OXvfHRd5Qg/7SjMMEIwKFimBqrFnTdtTH9jSU=", "path": "../systems/backup-2", "type": "path" }, @@ -3776,7 +3776,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-sFGPhENPE1/3SVYWqwOH8P8GjwUR0wPd9572w+Asxmo=", + "narHash": "sha256-qMGFJ0jSaCq+lbvhgAF/ndZe2w6KbCVuZStIZdRctBA=", "path": "../systems/dilion", "type": "path" }, @@ -3824,7 +3824,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-dX4Z5BYOn5R0RPUNLUGUfDf2csJic+lC/k1SHtp+kR0=", + "narHash": "sha256-+/zr56Fj0elDHugf3dSoSS+N0vG26vF4U9B4UEEVAhE=", "path": "../systems/eldiron", "type": "path" }, @@ -3850,7 +3850,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-r7yQaZe7ojo2nlLgbgQnXHqi194q4fN9VZHR5EGcYV4=", + "narHash": "sha256-rb97Ic4EpPLIKaA34BX18VJyha5q9n4qvBba0b+tZAg=", "path": "../systems/monitoring-1", "type": "path" }, @@ -3875,7 +3875,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-DjyZ+Dt/aR6Vc97ypTwVMbEweSQnQ43kHfTIcppOd8M=", + "narHash": "sha256-iEl0ox4MU8dLnwH2prNCosxRmZWld6R3Wyf0aPk/koM=", "path": "../systems/quatresaisons", "type": "path" }, @@ -3895,7 +3895,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-acODJQsPL2NMxEWVSyLTYdoeg3ikseGiNlnKYqeOd6Q=", + "narHash": "sha256-TpEvHjtYcwJmnPpNHnJDFEfcn0Ee+xMVguxIXjGWbg4=", "path": "../systems/zoldene", "type": "path" }, @@ -7499,7 +7499,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-B+K9uBB44zUGKHsR70jeJ8Tiydvh3i5UQR/ZU7nRN/U=", + "narHash": "sha256-xH6yyfvDLevdZrnKsGXhkZmNMZkOPJOqXnpubkfnoOE=", "path": "../../flakes/private/system", "type": "path" }, @@ -7518,7 +7518,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-B+K9uBB44zUGKHsR70jeJ8Tiydvh3i5UQR/ZU7nRN/U=", + "narHash": "sha256-xH6yyfvDLevdZrnKsGXhkZmNMZkOPJOqXnpubkfnoOE=", "path": "../../flakes/private/system", "type": "path" }, @@ -7571,7 +7571,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-WmYq012p6U6KrAR1G+zyto8x0iCNqBMHmMgcdHu2o1o=", + "narHash": "sha256-TeZKpuqFi0PEnhays+oL+hrNlO/O+IV/4B+Vtim4DKY=", "path": "../../flakes/etherpad-lite", "type": "path" }, @@ -7613,7 +7613,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-OziOtTgYe7QbdiOLjPcBLLAfBX9HXaEeTiw1yCZFyTI=", + "narHash": "sha256-kbhkTVO086HibTB2ke3Qc458FwLUp2CqU8XUjuaAIug=", "path": "../../flakes/grocy", "type": "path" }, @@ -7694,7 +7694,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-jxTNlRKgwoM8H/HHeIkrssrrVLFIWZJqg0QwPuipZ6A=", + "narHash": "sha256-PPOh6hf0hakuHCBOgJok208Qc3xKpuwwxhHV2QQRbmA=", "path": "../../flakes/mypackages", "type": "path" }, @@ -7817,7 +7817,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-PnXbm79feLDlquMaAFoevudYnu2deMutFLbpzd1/XxA=", + "narHash": "sha256-+z5CIx4Gin8Ygu3qQbd5QMPuChzPkhtSv+kUm6dUW/s=", "path": "../../flakes/surfer", "type": "path" }, @@ -7962,7 +7962,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-WmYq012p6U6KrAR1G+zyto8x0iCNqBMHmMgcdHu2o1o=", + "narHash": "sha256-TeZKpuqFi0PEnhays+oL+hrNlO/O+IV/4B+Vtim4DKY=", "path": "./etherpad-lite", "type": "path" }, @@ -8004,7 +8004,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-OziOtTgYe7QbdiOLjPcBLLAfBX9HXaEeTiw1yCZFyTI=", + "narHash": "sha256-kbhkTVO086HibTB2ke3Qc458FwLUp2CqU8XUjuaAIug=", "path": "./grocy", "type": "path" }, @@ -8104,7 +8104,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-jxTNlRKgwoM8H/HHeIkrssrrVLFIWZJqg0QwPuipZ6A=", + "narHash": "sha256-PPOh6hf0hakuHCBOgJok208Qc3xKpuwwxhHV2QQRbmA=", "path": "./mypackages", "type": "path" }, @@ -8409,7 +8409,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-B+K9uBB44zUGKHsR70jeJ8Tiydvh3i5UQR/ZU7nRN/U=", + "narHash": "sha256-xH6yyfvDLevdZrnKsGXhkZmNMZkOPJOqXnpubkfnoOE=", "path": "./private/system", "type": "path" }, @@ -8451,7 +8451,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-PnXbm79feLDlquMaAFoevudYnu2deMutFLbpzd1/XxA=", + "narHash": "sha256-+z5CIx4Gin8Ygu3qQbd5QMPuChzPkhtSv+kUm6dUW/s=", "path": "./surfer", "type": "path" }, @@ -9015,7 +9015,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-B+K9uBB44zUGKHsR70jeJ8Tiydvh3i5UQR/ZU7nRN/U=", + "narHash": "sha256-xH6yyfvDLevdZrnKsGXhkZmNMZkOPJOqXnpubkfnoOE=", "path": "../../flakes/private/system", "type": "path" }, @@ -9034,7 +9034,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-B+K9uBB44zUGKHsR70jeJ8Tiydvh3i5UQR/ZU7nRN/U=", + "narHash": "sha256-xH6yyfvDLevdZrnKsGXhkZmNMZkOPJOqXnpubkfnoOE=", "path": "../../flakes/private/system", "type": "path" }, @@ -9053,7 +9053,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-B+K9uBB44zUGKHsR70jeJ8Tiydvh3i5UQR/ZU7nRN/U=", + "narHash": "sha256-xH6yyfvDLevdZrnKsGXhkZmNMZkOPJOqXnpubkfnoOE=", "path": "../../flakes/private/system", "type": "path" }, @@ -9072,7 +9072,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-B+K9uBB44zUGKHsR70jeJ8Tiydvh3i5UQR/ZU7nRN/U=", + "narHash": "sha256-xH6yyfvDLevdZrnKsGXhkZmNMZkOPJOqXnpubkfnoOE=", "path": "../../flakes/private/system", "type": "path" }, diff --git a/flakes/grocy/flake.lock b/flakes/grocy/flake.lock index 3bce1fc..f137e52 100644 --- a/flakes/grocy/flake.lock +++ b/flakes/grocy/flake.lock @@ -58,7 +58,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-jxTNlRKgwoM8H/HHeIkrssrrVLFIWZJqg0QwPuipZ6A=", + "narHash": "sha256-PPOh6hf0hakuHCBOgJok208Qc3xKpuwwxhHV2QQRbmA=", "path": "../mypackages", "type": "path" }, diff --git a/flakes/mypackages/pkgs/shaarli/shaarli_ldap.patch b/flakes/mypackages/pkgs/shaarli/shaarli_ldap.patch index e66a54f..2f6c19e 100644 --- a/flakes/mypackages/pkgs/shaarli/shaarli_ldap.patch +++ b/flakes/mypackages/pkgs/shaarli/shaarli_ldap.patch @@ -132,12 +132,12 @@ index 32aaea4..99efc15 100644 - $this->setEmpty('resource.history', 'data/history.php'); + if ($this->userSpace === null) { + $data = 'data'; -+ $tmp = 'tmp'; ++ $tmp = 'tmp/'; + $cache = 'cache'; + $pagecache = 'pagecache'; + } else { + $data = 'data/' . ($this->userSpace); -+ $tmp = 'tmp/' . ($this->userSpace); ++ $tmp = 'tmp/' . ($this->userSpace) . '/'; + $cache = 'cache/' . ($this->userSpace); + $pagecache = 'pagecache/' . ($this->userSpace); + } diff --git a/flakes/private/system/flake.lock b/flakes/private/system/flake.lock index 2d0c0da..280af0e 100644 --- a/flakes/private/system/flake.lock +++ b/flakes/private/system/flake.lock @@ -69,7 +69,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-jxTNlRKgwoM8H/HHeIkrssrrVLFIWZJqg0QwPuipZ6A=", + "narHash": "sha256-PPOh6hf0hakuHCBOgJok208Qc3xKpuwwxhHV2QQRbmA=", "path": "../../mypackages", "type": "path" }, diff --git a/flakes/surfer/flake.lock b/flakes/surfer/flake.lock index 14201e2..5f0ec8c 100644 --- a/flakes/surfer/flake.lock +++ b/flakes/surfer/flake.lock @@ -41,7 +41,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-jxTNlRKgwoM8H/HHeIkrssrrVLFIWZJqg0QwPuipZ6A=", + "narHash": "sha256-PPOh6hf0hakuHCBOgJok208Qc3xKpuwwxhHV2QQRbmA=", "path": "../mypackages", "type": "path" }, -- cgit v1.2.3