From 9cf5d33f09f0972c62dac03cb32a94b2c55ce8fa Mon Sep 17 00:00:00 2001
From: Jan Christoph Ebersbach <jan-christoph.ebersbach@identinet.io>
Date: Sun, 3 Nov 2024 10:15:33 +0100
Subject: [PATCH 1/2] sope: add jceb to maintainers

---
 pkgs/by-name/so/sope/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/so/sope/package.nix b/pkgs/by-name/so/sope/package.nix
index 89372fca3f63..aad8948b398e 100644
--- a/pkgs/by-name/so/sope/package.nix
+++ b/pkgs/by-name/so/sope/package.nix
@@ -59,6 +59,6 @@ gnustep.stdenv.mkDerivation rec {
     license = licenses.publicDomain;
     homepage = "https://github.com/inverse-inc/sope";
     platforms = platforms.linux;
-    maintainers = [ ];
+    maintainers = with maintainers; [ jceb ];
   };
 }

From 81b0e3f7fa14dac6ac28c00966a171f5f2573055 Mon Sep 17 00:00:00 2001
From: Jan Christoph Ebersbach <jan-christoph.ebersbach@identinet.io>
Date: Sun, 3 Nov 2024 10:15:59 +0100
Subject: [PATCH 2/2] sogo: 5.11.0 -> 5.11.2

---
 pkgs/by-name/so/sogo/package.nix |  4 ++--
 pkgs/by-name/so/sope/package.nix | 24 ++++++++----------------
 2 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/pkgs/by-name/so/sogo/package.nix b/pkgs/by-name/so/sogo/package.nix
index b24910f4bb05..4cd51f1307a0 100644
--- a/pkgs/by-name/so/sogo/package.nix
+++ b/pkgs/by-name/so/sogo/package.nix
@@ -5,14 +5,14 @@
 , libwbxml }:
 gnustep.stdenv.mkDerivation rec {
   pname = "sogo";
-  version = "5.11.0";
+  version = "5.11.2";
 
   # always update the sope package as well, when updating sogo
   src = fetchFromGitHub {
     owner = "Alinto";
     repo = pname;
     rev = "SOGo-${version}";
-    hash = "sha256-2/0OaCAQkdnDPGOVERZs2Oz+bCpQN3MTLzp2pz0WB08=";
+    hash = "sha256-c+547x7ugYoLMgGVLcMmmb9rzquRJOv8n+Js2CuE7I0=";
   };
 
   nativeBuildInputs = [ gnustep.make makeWrapper python3 pkg-config ];
diff --git a/pkgs/by-name/so/sope/package.nix b/pkgs/by-name/so/sope/package.nix
index aad8948b398e..67fcb756e9bc 100644
--- a/pkgs/by-name/so/sope/package.nix
+++ b/pkgs/by-name/so/sope/package.nix
@@ -3,23 +3,15 @@
 
 gnustep.stdenv.mkDerivation rec {
   pname = "sope";
-  version = "5.9.0";
+  version = "5.11.2";
 
   src = fetchFromGitHub {
-    owner = "inverse-inc";
+    owner = "Alinto";
     repo = pname;
     rev = "SOPE-${version}";
-    hash = "sha256-JZh8sC/w2MRy3UyWYGMvU47XtWKGnLuUlCsVyyxd7zg=";
+    hash = "sha256-6vec2ZgpK5jcKr3c2SLn6fLAun56MDjupWtR6dMdjag=";
   };
 
-  patches = [
-    (fetchpatch {  # https://github.com/Alinto/sope/pull/66
-      name = "sope-fix-gnustep-1.29.0+.patch";
-      url = "https://github.com/Alinto/sope/pull/66/commits/9ec2744cc851b11886c3ebb723138e4d672bd5c7.patch";
-      hash = "sha256-JgYRwjmjlitgzYz9Jfei5XJRThP1TunPjI0g5M2wZPA=";
-    })
-  ];
-
   nativeBuildInputs = [ gnustep.make ];
   buildInputs = [ gnustep.base libxml2 openssl ]
     ++ lib.optional (openldap != null) openldap
@@ -45,7 +37,7 @@ gnustep.stdenv.mkDerivation rec {
 
   env = {
     GNUSTEP_CONFIG_FILE = "/build/GNUstep.conf";
-    NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
+    NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types -Wno-error=int-conversion";
   };
 
   # Move over the makefiles (see comment over preConfigure)
@@ -54,11 +46,11 @@ gnustep.stdenv.mkDerivation rec {
     find /build/Makefiles -mindepth 1 -maxdepth 1 -not -type l -exec cp -r '{}' $out/share/GNUstep/Makefiles \;
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Extensive set of frameworks which form a complete Web application server environment";
-    license = licenses.publicDomain;
+    license = lib.licenses.publicDomain;
     homepage = "https://github.com/inverse-inc/sope";
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ jceb ];
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ jceb ];
   };
 }