From a937a7ef30efbf78e2779db459ed9e1b3f0883fb Mon Sep 17 00:00:00 2001
From: Julian Stecklina <julian.stecklina@cyberus-technology.de>
Date: Mon, 18 Apr 2022 08:47:12 +0200
Subject: [PATCH 1/3] evolution: disable hardware accelerated HTML rendering

... because this causes problems for some users. For affected people,
the email composer becomes non-functional.
---
 .../networking/mailreaders/evolution/evolution/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix
index 9aac3db3594c..df13f4249b57 100644
--- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix
+++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix
@@ -112,6 +112,13 @@ stdenv.mkDerivation rec {
     "big-parallel"
   ];
 
+  # On some systems (at least, Intel TGL iGPU), the email composer is
+  # broken since Webkit enables accelerated rending by default in
+  # 2.36. See #168645.
+  preFixup = ''
+    gappsWrapperArgs+=(--set WEBKIT_DISABLE_COMPOSITING_MODE 1)
+  '';
+
   doCheck = true;
 
   passthru = {

From 0b742e307c2204f74b6bfcd860cbb8e3571e967d Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte@vanpetegem.me>
Date: Sun, 17 Apr 2022 13:39:06 +0200
Subject: [PATCH 2/3] mautrix-whatsapp: 0.3.0 -> 0.3.1

(cherry picked from commit aaa165b6e5a356790896c86ac745e85ad9b1d56f)
---
 pkgs/servers/mautrix-whatsapp/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix
index 26b4679f1f02..7af04959604e 100644
--- a/pkgs/servers/mautrix-whatsapp/default.nix
+++ b/pkgs/servers/mautrix-whatsapp/default.nix
@@ -2,18 +2,18 @@
 
 buildGo117Module rec {
   pname = "mautrix-whatsapp";
-  version = "0.3.0";
+  version = "0.3.1";
 
   src = fetchFromGitHub {
     owner = "mautrix";
     repo = "whatsapp";
     rev = "v${version}";
-    sha256 = "M44APMnpQU+9TTJu4NF528o0JvGvWja4H7XUcAHtxrA=";
+    sha256 = "adsGPVG/EwpzOqhFJvn3anjTXwGY27a7Bc4NNkBeqJk=";
   };
 
   buildInputs = [ olm ];
 
-  vendorSha256 = "sha256-/sj8PXHgMS+uYI6hghKx3sJViUSh82wxjO6Z4gxDHqw=";
+  vendorSha256 = "sha256-f2sHMUvS8maYms8eqeQe5ez6G234CkLASIuKolqhO4k=";
 
   doCheck = false;
 

From 3c5d0357fdf1895afe97b9aafd6b0b30f81dc2ce Mon Sep 17 00:00:00 2001
From: Sumner Evans <me@sumnerevans.com>
Date: Tue, 19 Apr 2022 08:16:57 -0600
Subject: [PATCH 3/3] matrix-synapse: 1.56.0 -> 1.57.0

(cherry picked from commit a6bc9e05cf44900c7eca2846935530c98f1c1b62)
---
 pkgs/servers/matrix-synapse/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix
index 30d45a89b134..235d1895e152 100644
--- a/pkgs/servers/matrix-synapse/default.nix
+++ b/pkgs/servers/matrix-synapse/default.nix
@@ -11,11 +11,11 @@ in
 with python3.pkgs;
 buildPythonApplication rec {
   pname = "matrix-synapse";
-  version = "1.56.0";
+  version = "1.57.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-MWMCGgsWJqIO4xefIHxp/mtR7yxLrJOfTsb2hxlGeiY=";
+    sha256 = "sha256-pZhm3jfpqOcLT+M4eeD8FyHtwj5EOAFESFu+4ZMoz0s=";
   };
 
   buildInputs = [ openssl ];