From 635b4a92f4b9c527885ae22b6dc96ca8837c04ea Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 13 Jul 2023 11:00:37 +0000
Subject: [PATCH 1/3] libquotient: 0.7.2 -> 0.8.0

---
 pkgs/development/libraries/libquotient/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libquotient/default.nix b/pkgs/development/libraries/libquotient/default.nix
index c36bddc347f2..e89a1a017fb7 100644
--- a/pkgs/development/libraries/libquotient/default.nix
+++ b/pkgs/development/libraries/libquotient/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libquotient";
-  version = "0.7.2";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
     owner = "quotient-im";
     repo = "libQuotient";
     rev = version;
-    hash = "sha256-Lq404O2VjZ8vlXOW+rhsvWDvZsNd3APNbv6AadQCjhk=";
+    hash = "sha256-ecTHiWbsNDIUz+Sadh2pVbDRZFzdMkZXBYSjy1JqZrk=";
   };
 
   buildInputs = [ olm openssl qtbase qtmultimedia qtkeychain ];

From 523e56dc45d1bf73621390850328b79c49bebcd3 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Tue, 8 Aug 2023 23:41:13 +0200
Subject: [PATCH 2/3] neochat: add patch for libquotient 0.8

---
 pkgs/applications/kde/neochat.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/applications/kde/neochat.nix b/pkgs/applications/kde/neochat.nix
index 4df33add6795..0b9f3c57f610 100644
--- a/pkgs/applications/kde/neochat.nix
+++ b/pkgs/applications/kde/neochat.nix
@@ -1,5 +1,6 @@
 { mkDerivation
 , lib
+, fetchpatch
 
 , cmake
 , extra-cmake-modules
@@ -32,6 +33,14 @@
 mkDerivation {
   pname = "neochat";
 
+  patches = [
+    (fetchpatch {
+      name = "libquotient-0.8.patch";
+      url = "https://invent.kde.org/network/neochat/-/commit/d9d5e17be2a2057ab2ee545561fab721cb211f7f.patch";
+      hash = "sha256-y1PEehFCW+69OH8YvL3SUGOb8Hhyf8xwRvSZzJ5J5Wc=";
+    })
+  ];
+
   nativeBuildInputs = [
     cmake
     extra-cmake-modules

From d306c6b66bd1f806192ada44f12c9878bd347534 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Tue, 8 Aug 2023 23:47:46 +0200
Subject: [PATCH 3/3] quaternion: 0.0.96-beta1 -> 0.0.96-beta4

---
 .../instant-messengers/quaternion/default.nix      | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/quaternion/default.nix b/pkgs/applications/networking/instant-messengers/quaternion/default.nix
index 5fa0580c73b0..2bb54b8b5bd7 100644
--- a/pkgs/applications/networking/instant-messengers/quaternion/default.nix
+++ b/pkgs/applications/networking/instant-messengers/quaternion/default.nix
@@ -13,15 +13,15 @@
 , olm
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "quaternion";
-  version = "0.0.95.81";
+  version = "0.0.96-beta4";
 
   src = fetchFromGitHub {
-    owner = "QMatrixClient";
+    owner = "quotient-im";
     repo = "Quaternion";
-    rev = "5f639d8c84ed1475057b2cb3f7d0cb0abe77203b";
-    hash = "sha256-/1fich97oqSSDpfOjaYghYzHfu3MDrh77nanbIN/v/w=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-yItl31Ze48lRIIey+FlRLMVAkg4mHu8G1sFOceHvTJw=";
   };
 
   buildInputs = [
@@ -36,6 +36,10 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ cmake qttools wrapQtAppsHook ];
 
+  cmakeFlags = [
+    "-DBUILD_WITH_QT6=OFF"
+  ];
+
   postInstall =
     if stdenv.isDarwin then ''
       mkdir -p $out/Applications