From cd84b8ad8b2f64f6ccf1f27b910bcdd274585fb0 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 12 Aug 2021 23:24:30 +0200
Subject: [PATCH 1/3] mautrix-telegram: 0.10.0 -> unstable-2021-08-12

(cherry picked from commit 682f35087a1baef814620cfcb9e99b068a5cd65f)
---
 pkgs/servers/mautrix-telegram/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/mautrix-telegram/default.nix b/pkgs/servers/mautrix-telegram/default.nix
index 74280f048ce..dce4ad4117d 100644
--- a/pkgs/servers/mautrix-telegram/default.nix
+++ b/pkgs/servers/mautrix-telegram/default.nix
@@ -13,19 +13,21 @@ let
 
 in buildPythonPackage rec {
   pname = "mautrix-telegram";
-  version = "0.9.0";
-  disabled = pythonOlder "3.7";
+  version = "unstable-2021-08-12";
+  disabled = python.pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "tulir";
     repo = pname;
-    rev = "v${version}";
-    sha256 = "1543ljjl3jg3ayid7ifi4bamqh4gq85pmlbs3m8i7phjbbm7g9dn";
+    rev = "ec64c83cb01791525a39f937f3b847368021dce8";
+    sha256 = "0rg4f4abdddhhf1xpz74y4468dv3mnm7k8nj161r1xszrk9f2n76";
   };
 
   patches = [ ./0001-Re-add-entrypoint.patch ./0002-Don-t-depend-on-pytest-runner.patch ];
   postPatch = ''
     sed -i -e '/alembic>/d' requirements.txt
+    substituteInPlace requirements.txt \
+      --replace "telethon>=1.22,<1.23" "telethon"
   '';
 
   propagatedBuildInputs = [

From e1042038ac15ad7cf447fa1ed23a3746ee5d8331 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 19 Aug 2021 14:25:56 +0200
Subject: [PATCH 2/3] mautrix-telegram: 2021-08-12 -> 0.10.1

ChangeLog: https://github.com/mautrix/telegram/releases/tag/v0.10.1
(cherry picked from commit dd39ec87f41db66ae4b9cb68e40cea811f863ebc)
---
 pkgs/servers/mautrix-telegram/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/mautrix-telegram/default.nix b/pkgs/servers/mautrix-telegram/default.nix
index dce4ad4117d..c236bdba61e 100644
--- a/pkgs/servers/mautrix-telegram/default.nix
+++ b/pkgs/servers/mautrix-telegram/default.nix
@@ -13,14 +13,14 @@ let
 
 in buildPythonPackage rec {
   pname = "mautrix-telegram";
-  version = "unstable-2021-08-12";
+  version = "0.10.1";
   disabled = python.pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "tulir";
     repo = pname;
-    rev = "ec64c83cb01791525a39f937f3b847368021dce8";
-    sha256 = "0rg4f4abdddhhf1xpz74y4468dv3mnm7k8nj161r1xszrk9f2n76";
+    rev = "v${version}";
+    sha256 = "sha256-1Dmc7WRlT2ivGkdrGDC1b44DE0ovQKfUR0gDiQE4h5c=";
   };
 
   patches = [ ./0001-Re-add-entrypoint.patch ./0002-Don-t-depend-on-pytest-runner.patch ];

From 05e5b69ac8d423c1501bcc96126e533bf5d96a89 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 20 Aug 2021 11:17:04 +0200
Subject: [PATCH 3/3] mautrix-telegram: override mautrix to version 0.10.4

This is needed since 0.10.1 of mautrix-telegram, but it'd be a breaking
change of mautrix, which can be used for any kind of matrix client, so I
don't really want to break it.
---
 pkgs/servers/mautrix-telegram/default.nix | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/mautrix-telegram/default.nix b/pkgs/servers/mautrix-telegram/default.nix
index c236bdba61e..eba429e8cce 100644
--- a/pkgs/servers/mautrix-telegram/default.nix
+++ b/pkgs/servers/mautrix-telegram/default.nix
@@ -2,16 +2,26 @@
 , withE2BE ? true
 }:
 
-with python3.pkgs;
-
 let
+  python = python3.override {
+    packageOverrides = self: super: {
+      mautrix = super.mautrix.overridePythonAttrs (oldAttrs: rec {
+        version = "0.10.4";
+        src = oldAttrs.src.override {
+          inherit version;
+          sha256 = "ffbc4e29eb56089539b408f8e4c12a5d5a5d11d7fe7d40f8c6279784c618b869";
+        };
+      });
+    };
+  };
+
   # officially supported database drivers
-  dbDrivers = [
+  dbDrivers = with python.pkgs; [
     psycopg2
     # sqlite driver is already shipped with python by default
   ];
 
-in buildPythonPackage rec {
+in with python.pkgs; buildPythonPackage rec {
   pname = "mautrix-telegram";
   version = "0.10.1";
   disabled = python.pythonOlder "3.7";