From ea8a30bb052f8341703baa7a3e2d3e660fc08e7f Mon Sep 17 00:00:00 2001
From: =?utf8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org>
Date: Thu, 26 Oct 2023 23:24:47 +0200
Subject: [PATCH] Upgrade spip and roundcube

---
 flakes/mypackages/pkgs/webapps/roundcubemail/default.nix | 4 ++--
 flakes/mypackages/pkgs/webapps/spip/default.nix          | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/flakes/mypackages/pkgs/webapps/roundcubemail/default.nix b/flakes/mypackages/pkgs/webapps/roundcubemail/default.nix
index bdddf2f..a786e86 100644
--- a/flakes/mypackages/pkgs/webapps/roundcubemail/default.nix
+++ b/flakes/mypackages/pkgs/webapps/roundcubemail/default.nix
@@ -57,11 +57,11 @@ let
     sha256 = "0j46y9ack2yq67naca6nfysbmyilwjlkl29dbswidf1lq09yhhj3";
   };
   package = stdenv.mkDerivation rec {
-    version = "1.4.4";
+    version = "1.4.15";
     name = "roundcubemail-${version}";
     src= fetchurl {
       url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/${name}-complete.tar.gz";
-      sha256 = "1my726p0wmsn21nbdsjx02h6hnbh8nidzipzdy0gk0qgda1j729b";
+      sha256 = "sha256-0CRVGmPCjMOUPEELpWk93TifchXUbzhUvS55IOgaAh8=";
     };
     patches = [ ./add_all.patch ]; # This patch includes js modification which requires to re-run the jsshrink below
     buildInputs = [ unzip jre ];
diff --git a/flakes/mypackages/pkgs/webapps/spip/default.nix b/flakes/mypackages/pkgs/webapps/spip/default.nix
index 20d5c8c..3f335a7 100644
--- a/flakes/mypackages/pkgs/webapps/spip/default.nix
+++ b/flakes/mypackages/pkgs/webapps/spip/default.nix
@@ -7,10 +7,11 @@
 let
   app = stdenv.mkDerivation rec {
     name = "${siteName}-${environment}-spip-${version}";
-    version = "3.2.7";
+    version = "3.2.18";
     src = fetchzip {
-      url = "https://files.spip.net/spip/archives/SPIP-v${version}.zip";
-      sha256 = "0n4kc95nhn524zbb11bpfjs965pm4v026s3m3q44pl8nyms91r33";
+      url = "https://files.spip.net/spip/archives/spip-v${version}.zip";
+      sha256 = "sha256-KNw9G3PEHpVvsBvKsZfqNaymhwHkJ28F8a44qr5tQyw=";
+      stripRoot = false;
     };
     paches = lib.optionals ldap [ ./spip_ldap_patch.patch ];
     buildPhase = ''
-- 
2.41.0