From bcc5c188084191eec8f3eb82da97b071be07203f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=B9=82=E0=B8=97=E0=B8=AA=E0=B8=BA=E0=B8=95=E0=B8=B1?=
 =?UTF-8?q?=E0=B8=A5?= <toastal@posteo.net>
Date: Tue, 18 Mar 2025 10:30:15 +0700
Subject: [PATCH 1/3] psi-plus: remove with lib;

---
 .../networking/instant-messengers/psi-plus/default.nix    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
index 8baa78499017..c962880e04ff 100644
--- a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
+++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
@@ -103,15 +103,15 @@ mkDerivation rec {
     )
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://psi-plus.com";
     description = "XMPP (Jabber) client based on Qt5";
     mainProgram = "psi-plus";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       orivej
       unclechu
     ];
-    license = licenses.gpl2Only;
-    platforms = platforms.linux;
+    license = lib.licenses.gpl2Only;
+    platforms = lib.platforms.linux;
   };
 }

From 69ebbfbc7fe60a767f7fab1b89c08b55d2b7e373 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=B9=82=E0=B8=97=E0=B8=AA=E0=B8=BA=E0=B8=95=E0=B8=B1?=
 =?UTF-8?q?=E0=B8=A5?= <toastal@posteo.net>
Date: Tue, 18 Mar 2025 10:34:23 +0700
Subject: [PATCH 2/3] psi-plus: make plugins-only libs optional

---
 .../instant-messengers/psi-plus/default.nix        | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
index c962880e04ff..6cef9d8a9c63 100644
--- a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
+++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
@@ -14,10 +14,7 @@
   hunspell,
   libsecret,
   libgcrypt,
-  libotr,
-  html-tidy,
   libgpg-error,
-  libsignal-protocol-c,
   usrsctp,
 
   chatType ? "basic", # See the assertion below for available options
@@ -25,6 +22,9 @@
   qtwebengine,
 
   enablePlugins ? true,
+  html-tidy,
+  libotr,
+  libsignal-protocol-c,
 
   # Voice messages
   voiceMessagesSupport ? true,
@@ -80,16 +80,18 @@ mkDerivation rec {
       hunspell
       libsecret
       libgcrypt
-      libotr
-      html-tidy
       libgpg-error
-      libsignal-protocol-c
       usrsctp
     ]
     ++ lib.optionals voiceMessagesSupport [
       gst_all_1.gst-plugins-base
       gst_all_1.gst-plugins-good
     ]
+    ++ lib.optionals enablePlugins [
+      html-tidy
+      libotr
+      libsignal-protocol-c
+    ]
     ++ lib.optionals (chatType == "webkit") [
       qtwebkit
     ]

From 79d05b0beb318d527ea962b48b9d188efb6b43b7 Mon Sep 17 00:00:00 2001
From: Derry Tutt <82726593+everypizza1@users.noreply.github.com>
Date: Mon, 17 Mar 2025 11:09:48 -0500
Subject: [PATCH 3/3] =?UTF-8?q?psi-plus:=201.5.1653=20=E2=86=92=201.5.2072?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: โทสฺตัล <toastal@posteo.net>
---
 .../instant-messengers/psi-plus/default.nix         | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
index 6cef9d8a9c63..95d847a77b9f 100644
--- a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
+++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
@@ -16,6 +16,7 @@
   libgcrypt,
   libgpg-error,
   usrsctp,
+  qtkeychain,
 
   chatType ? "basic", # See the assertion below for available options
   qtwebkit,
@@ -23,13 +24,13 @@
 
   enablePlugins ? true,
   html-tidy,
+  http-parser,
   libotr,
-  libsignal-protocol-c,
+  libomemo-c,
 
   # Voice messages
   voiceMessagesSupport ? true,
   gst_all_1,
-
   enablePsiMedia ? false,
   pkg-config,
 }:
@@ -44,13 +45,13 @@ assert enablePsiMedia -> enablePlugins;
 
 mkDerivation rec {
   pname = "psi-plus";
-  version = "1.5.1653";
 
+  version = "1.5.2072";
   src = fetchFromGitHub {
     owner = "psi-plus";
     repo = "psi-plus-snapshots";
     rev = version;
-    sha256 = "sha256-9WT2S6ZgIsrHoEAvlWUB078gzCdrPylvSjkkogU5tsU=";
+    sha256 = "sha256-RlZwMBWjhCTEEV08UHbf8NvuqmuihXwR1aA/vMmD1BM=";
   };
 
   cmakeFlags = [
@@ -82,6 +83,7 @@ mkDerivation rec {
       libgcrypt
       libgpg-error
       usrsctp
+      qtkeychain
     ]
     ++ lib.optionals voiceMessagesSupport [
       gst_all_1.gst-plugins-base
@@ -89,8 +91,9 @@ mkDerivation rec {
     ]
     ++ lib.optionals enablePlugins [
       html-tidy
+      http-parser
       libotr
-      libsignal-protocol-c
+      libomemo-c
     ]
     ++ lib.optionals (chatType == "webkit") [
       qtwebkit