Bump spip version

7 files changed, 51 insertions, 43 deletions

diff --git a/flakes/copanier/flake.nix b/flakes/copanier/flake.nix
index 74e6829..175a5f7 100644
--- a/flakes/copanier/flake.nix
+++ b/flakes/copanier/flake.nix
@@ -12,6 +12,12 @@
     let
       pkgs = import nixpkgs { inherit system; overlays = []; };
     in rec {
+      devShells.default = pkgs.mkShell {
+        buildInputs = [ pkgs.poetry ];
+        shellHook = ''
+          echo 'Run "poetry add --lock thepackage" to add new dependencies'
+        '';
+      };
       packages.copanier = pkgs.callPackage ./. { src = copanier; };
       defaultPackage = packages.copanier;
       legacyPackages.copanier = packages.copanier;
diff --git a/flakes/etherpad-lite/flake.lock b/flakes/etherpad-lite/flake.lock
index e6c02c8..3295c28 100644
--- a/flakes/etherpad-lite/flake.lock
+++ b/flakes/etherpad-lite/flake.lock
@@ -58,7 +58,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-LB6s98L2OEDG6p79qlbp0OeMJ0t89qGaIjXSQyaLjpk=",
+        "narHash": "sha256-etK0kcWYmiCmdex+9CjWWqn4q8EonDutUP0yFH+odrE=",
         "path": "../mypackages",
         "type": "path"
       },
diff --git a/flakes/flake.lock b/flakes/flake.lock
index d6e655e..16026b5 100644
--- a/flakes/flake.lock
+++ b/flakes/flake.lock
@@ -3016,7 +3016,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-LB6s98L2OEDG6p79qlbp0OeMJ0t89qGaIjXSQyaLjpk=",
+        "narHash": "sha256-etK0kcWYmiCmdex+9CjWWqn4q8EonDutUP0yFH+odrE=",
         "path": "../../mypackages",
         "type": "path"
       },
@@ -3033,7 +3033,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-LB6s98L2OEDG6p79qlbp0OeMJ0t89qGaIjXSQyaLjpk=",
+        "narHash": "sha256-etK0kcWYmiCmdex+9CjWWqn4q8EonDutUP0yFH+odrE=",
         "path": "../mypackages",
         "type": "path"
       },
@@ -3050,7 +3050,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-LB6s98L2OEDG6p79qlbp0OeMJ0t89qGaIjXSQyaLjpk=",
+        "narHash": "sha256-etK0kcWYmiCmdex+9CjWWqn4q8EonDutUP0yFH+odrE=",
         "path": "../mypackages",
         "type": "path"
       },
@@ -3067,7 +3067,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-LB6s98L2OEDG6p79qlbp0OeMJ0t89qGaIjXSQyaLjpk=",
+        "narHash": "sha256-etK0kcWYmiCmdex+9CjWWqn4q8EonDutUP0yFH+odrE=",
         "path": "../../mypackages",
         "type": "path"
       },
@@ -3084,7 +3084,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-LB6s98L2OEDG6p79qlbp0OeMJ0t89qGaIjXSQyaLjpk=",
+        "narHash": "sha256-etK0kcWYmiCmdex+9CjWWqn4q8EonDutUP0yFH+odrE=",
         "path": "../mypackages",
         "type": "path"
       },
@@ -3101,7 +3101,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-LB6s98L2OEDG6p79qlbp0OeMJ0t89qGaIjXSQyaLjpk=",
+        "narHash": "sha256-etK0kcWYmiCmdex+9CjWWqn4q8EonDutUP0yFH+odrE=",
         "path": "../../mypackages",
         "type": "path"
       },
@@ -3118,7 +3118,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-LB6s98L2OEDG6p79qlbp0OeMJ0t89qGaIjXSQyaLjpk=",
+        "narHash": "sha256-etK0kcWYmiCmdex+9CjWWqn4q8EonDutUP0yFH+odrE=",
         "path": "../../mypackages",
         "type": "path"
       },
@@ -3135,7 +3135,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-LB6s98L2OEDG6p79qlbp0OeMJ0t89qGaIjXSQyaLjpk=",
+        "narHash": "sha256-etK0kcWYmiCmdex+9CjWWqn4q8EonDutUP0yFH+odrE=",
         "path": "../mypackages",
         "type": "path"
       },
@@ -3152,7 +3152,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-LB6s98L2OEDG6p79qlbp0OeMJ0t89qGaIjXSQyaLjpk=",
+        "narHash": "sha256-etK0kcWYmiCmdex+9CjWWqn4q8EonDutUP0yFH+odrE=",
         "path": "../mypackages",
         "type": "path"
       },
@@ -3169,7 +3169,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-LB6s98L2OEDG6p79qlbp0OeMJ0t89qGaIjXSQyaLjpk=",
+        "narHash": "sha256-etK0kcWYmiCmdex+9CjWWqn4q8EonDutUP0yFH+odrE=",
         "path": "../mypackages",
         "type": "path"
       },
@@ -3186,7 +3186,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-LB6s98L2OEDG6p79qlbp0OeMJ0t89qGaIjXSQyaLjpk=",
+        "narHash": "sha256-etK0kcWYmiCmdex+9CjWWqn4q8EonDutUP0yFH+odrE=",
         "path": "../../mypackages",
         "type": "path"
       },
@@ -3203,7 +3203,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-LB6s98L2OEDG6p79qlbp0OeMJ0t89qGaIjXSQyaLjpk=",
+        "narHash": "sha256-etK0kcWYmiCmdex+9CjWWqn4q8EonDutUP0yFH+odrE=",
         "path": "../../mypackages",
         "type": "path"
       },
@@ -3220,7 +3220,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-LB6s98L2OEDG6p79qlbp0OeMJ0t89qGaIjXSQyaLjpk=",
+        "narHash": "sha256-etK0kcWYmiCmdex+9CjWWqn4q8EonDutUP0yFH+odrE=",
         "path": "../../mypackages",
         "type": "path"
       },
@@ -3753,7 +3753,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-z8jKG8vF20YZLuzLYiLLNp7emsIf5VWQBSFanAv2cF4=",
+        "narHash": "sha256-B2JdIp5q/8/LurN4lXB17C1+mpEKeqPzObmNOObO5rQ=",
         "path": "../systems/backup-2",
         "type": "path"
       },
@@ -3776,7 +3776,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-BkCRyrS5N4RxSYHWH/ut296JwKcp6HbR/H6r4CTfFxU=",
+        "narHash": "sha256-dWAbGxB91utxwTlxsJZdp2OSaIAo8y5LXjdTCFMRn+4=",
         "path": "../systems/dilion",
         "type": "path"
       },
@@ -3824,7 +3824,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-h37uZfLvL8aZZiQY1s5MxaXHqkdYiM9UekBs6EI/Mh0=",
+        "narHash": "sha256-/e9AQdrzAEVNHPWELMzlnx3BVItZYsEXGQ7hExGssWI=",
         "path": "../systems/eldiron",
         "type": "path"
       },
@@ -3850,7 +3850,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-Z9+/LKeS+VM7wCGFv9tecc5sGTmKLAlk2PH6T0PYuMk=",
+        "narHash": "sha256-6hqQjoy1lyIJziqe0AJ62aq62soi5D14NKOzNEY3SsQ=",
         "path": "../systems/monitoring-1",
         "type": "path"
       },
@@ -3875,7 +3875,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-r1/gDtef4KBK3vWhQF4hMb/pRs0olhilDjUBXdIb+uM=",
+        "narHash": "sha256-yBuAfW59X0e840QBFtQrefG3T/IQIQSXiZ4WU2/+gBI=",
         "path": "../systems/quatresaisons",
         "type": "path"
       },
@@ -3895,7 +3895,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-ozjB87SNwkQLQH2nkkIQJqC3HoewYe1z1PoyiNGmtcM=",
+        "narHash": "sha256-Z7JgLsTt6bsA6zUOj66yAYFg2L8gEPEgOR/YbZtyQGg=",
         "path": "../systems/zoldene",
         "type": "path"
       },
@@ -7499,7 +7499,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-a+XNRoZjx2k5uyAFCF/4OKxF3XUwxf+ECZJvnIphrEs=",
+        "narHash": "sha256-+s9C1mPCXRA44AC0Fg+B2uD6UiK0JfUA0F8fhceH0lQ=",
         "path": "../../flakes/private/system",
         "type": "path"
       },
@@ -7518,7 +7518,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-a+XNRoZjx2k5uyAFCF/4OKxF3XUwxf+ECZJvnIphrEs=",
+        "narHash": "sha256-+s9C1mPCXRA44AC0Fg+B2uD6UiK0JfUA0F8fhceH0lQ=",
         "path": "../../flakes/private/system",
         "type": "path"
       },
@@ -7535,7 +7535,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-v7ZhvU3UAmA7EtPWutYddHE84qbqWx/ugtFAEgpD4H0=",
+        "narHash": "sha256-d9VxZUS6DXH5mgA1Xb9SO/yZ3K12xLbXsTYBauV35gk=",
         "path": "../../flakes/copanier",
         "type": "path"
       },
@@ -7571,7 +7571,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-TY7xhDa/htWaMqdVrR9FuDuF/Qpur/tbyItGiaa4Bfc=",
+        "narHash": "sha256-0RN3EjVLumRs4/CYgYA1+UQecq+LyzrUJI6SpGHN/50=",
         "path": "../../flakes/etherpad-lite",
         "type": "path"
       },
@@ -7613,7 +7613,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-5sQ5m5pO1gjPFnArYeU/dXFVnc6rZQDu2kuSzSe0wlo=",
+        "narHash": "sha256-0j7YmFwrbLg3FKeAcZApJ240cpt6uhiEEZt5v52QN5Q=",
         "path": "../../flakes/grocy",
         "type": "path"
       },
@@ -7694,7 +7694,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-LB6s98L2OEDG6p79qlbp0OeMJ0t89qGaIjXSQyaLjpk=",
+        "narHash": "sha256-etK0kcWYmiCmdex+9CjWWqn4q8EonDutUP0yFH+odrE=",
         "path": "../../flakes/mypackages",
         "type": "path"
       },
@@ -7817,7 +7817,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-XUfcpd5m6smfhWOG4ICxAanwpTollGBI0/zNPh6BHAE=",
+        "narHash": "sha256-SaZuUdU7estQQxxOhZ0mRyaQHK3AnlCUo/lTP8MFBao=",
         "path": "../../flakes/surfer",
         "type": "path"
       },
@@ -7926,7 +7926,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-v7ZhvU3UAmA7EtPWutYddHE84qbqWx/ugtFAEgpD4H0=",
+        "narHash": "sha256-d9VxZUS6DXH5mgA1Xb9SO/yZ3K12xLbXsTYBauV35gk=",
         "path": "./copanier",
         "type": "path"
       },
@@ -7962,7 +7962,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-TY7xhDa/htWaMqdVrR9FuDuF/Qpur/tbyItGiaa4Bfc=",
+        "narHash": "sha256-0RN3EjVLumRs4/CYgYA1+UQecq+LyzrUJI6SpGHN/50=",
         "path": "./etherpad-lite",
         "type": "path"
       },
@@ -8004,7 +8004,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-5sQ5m5pO1gjPFnArYeU/dXFVnc6rZQDu2kuSzSe0wlo=",
+        "narHash": "sha256-0j7YmFwrbLg3FKeAcZApJ240cpt6uhiEEZt5v52QN5Q=",
         "path": "./grocy",
         "type": "path"
       },
@@ -8104,7 +8104,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-LB6s98L2OEDG6p79qlbp0OeMJ0t89qGaIjXSQyaLjpk=",
+        "narHash": "sha256-etK0kcWYmiCmdex+9CjWWqn4q8EonDutUP0yFH+odrE=",
         "path": "./mypackages",
         "type": "path"
       },
@@ -8409,7 +8409,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-a+XNRoZjx2k5uyAFCF/4OKxF3XUwxf+ECZJvnIphrEs=",
+        "narHash": "sha256-+s9C1mPCXRA44AC0Fg+B2uD6UiK0JfUA0F8fhceH0lQ=",
         "path": "./private/system",
         "type": "path"
       },
@@ -8451,7 +8451,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-XUfcpd5m6smfhWOG4ICxAanwpTollGBI0/zNPh6BHAE=",
+        "narHash": "sha256-SaZuUdU7estQQxxOhZ0mRyaQHK3AnlCUo/lTP8MFBao=",
         "path": "./surfer",
         "type": "path"
       },
@@ -9015,7 +9015,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-a+XNRoZjx2k5uyAFCF/4OKxF3XUwxf+ECZJvnIphrEs=",
+        "narHash": "sha256-+s9C1mPCXRA44AC0Fg+B2uD6UiK0JfUA0F8fhceH0lQ=",
         "path": "../../flakes/private/system",
         "type": "path"
       },
@@ -9034,7 +9034,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-a+XNRoZjx2k5uyAFCF/4OKxF3XUwxf+ECZJvnIphrEs=",
+        "narHash": "sha256-+s9C1mPCXRA44AC0Fg+B2uD6UiK0JfUA0F8fhceH0lQ=",
         "path": "../../flakes/private/system",
         "type": "path"
       },
@@ -9053,7 +9053,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-a+XNRoZjx2k5uyAFCF/4OKxF3XUwxf+ECZJvnIphrEs=",
+        "narHash": "sha256-+s9C1mPCXRA44AC0Fg+B2uD6UiK0JfUA0F8fhceH0lQ=",
         "path": "../../flakes/private/system",
         "type": "path"
       },
@@ -9072,7 +9072,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-a+XNRoZjx2k5uyAFCF/4OKxF3XUwxf+ECZJvnIphrEs=",
+        "narHash": "sha256-+s9C1mPCXRA44AC0Fg+B2uD6UiK0JfUA0F8fhceH0lQ=",
         "path": "../../flakes/private/system",
         "type": "path"
       },
diff --git a/flakes/grocy/flake.lock b/flakes/grocy/flake.lock
index b935cd7..0be1119 100644
--- a/flakes/grocy/flake.lock
+++ b/flakes/grocy/flake.lock
@@ -58,7 +58,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-LB6s98L2OEDG6p79qlbp0OeMJ0t89qGaIjXSQyaLjpk=",
+        "narHash": "sha256-etK0kcWYmiCmdex+9CjWWqn4q8EonDutUP0yFH+odrE=",
         "path": "../mypackages",
         "type": "path"
       },
diff --git a/flakes/mypackages/pkgs/webapps/spip/default.nix b/flakes/mypackages/pkgs/webapps/spip/default.nix
index 3f335a7..3248066 100644
--- a/flakes/mypackages/pkgs/webapps/spip/default.nix
+++ b/flakes/mypackages/pkgs/webapps/spip/default.nix
@@ -3,14 +3,14 @@
 , environment ? "prod"
 , ldap ? false
 , varDir ? "/var/lib/${siteName}_${environment}"
-, lib, fetchzip, runCommand, stdenv }:
+, lib, fetchzip, runCommand, stdenv, php82 }:
 let
   app = stdenv.mkDerivation rec {
     name = "${siteName}-${environment}-spip-${version}";
-    version = "3.2.18";
+    version = "4.2.9";
     src = fetchzip {
       url = "https://files.spip.net/spip/archives/spip-v${version}.zip";
-      sha256 = "sha256-KNw9G3PEHpVvsBvKsZfqNaymhwHkJ28F8a44qr5tQyw=";
+      sha256 = "sha256-eHQ0q6f8/bFtuxn5LvAtKp3OaDGRCdVUh3kug8iBIbA=";
       stripRoot = false;
     };
     paches = lib.optionals ldap [ ./spip_ldap_patch.patch ];
@@ -25,6 +25,8 @@ let
       cp -a ${siteDir}/* $out
     '';
     passthru = {
+      php = php82;
+      phpExtensions = all: [ all.curl all.xml all.gd all.sodium all.zip all.zlib all.mysqli ];
       inherit siteName siteDir environment varDir;
       webRoot = app;
       spipConfig = ./spip_mes_options.php;
diff --git a/flakes/private/system/flake.lock b/flakes/private/system/flake.lock
index 162068d..49fb3b5 100644
--- a/flakes/private/system/flake.lock
+++ b/flakes/private/system/flake.lock
@@ -69,7 +69,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-LB6s98L2OEDG6p79qlbp0OeMJ0t89qGaIjXSQyaLjpk=",
+        "narHash": "sha256-etK0kcWYmiCmdex+9CjWWqn4q8EonDutUP0yFH+odrE=",
         "path": "../../mypackages",
         "type": "path"
       },
diff --git a/flakes/surfer/flake.lock b/flakes/surfer/flake.lock
index 1686ce7..2c947a2 100644
--- a/flakes/surfer/flake.lock
+++ b/flakes/surfer/flake.lock
@@ -41,7 +41,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-LB6s98L2OEDG6p79qlbp0OeMJ0t89qGaIjXSQyaLjpk=",
+        "narHash": "sha256-etK0kcWYmiCmdex+9CjWWqn4q8EonDutUP0yFH+odrE=",
         "path": "../mypackages",
         "type": "path"
       },