Merge pull request #56193 from nyanloutre/mautrix-update

 mautrix-telegram: 0.4.0.post1 -> 0.5.0

4 files changed, 15 insertions, 50 deletions

diff --git a/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix b/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix
index 41e413948c28..c792136cb4fb 100644
--- a/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix
+++ b/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix
@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   pname = "telethon-session-sqlalchemy";
-  version = "0.2.9.post1";
+  version = "0.2.14";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "bbe6a8ca32dd42aa1830b91f08f0458d728dc9eedca0ca27814a34c0b566100e";
+    sha256 = "94aaf98afc051b4e167783f3d972bd9b51ab736a1e45df100bf52984e53eebac";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/telethon/default.nix b/pkgs/development/python-modules/telethon/default.nix
index 23a06c0cd253..09d944c80883 100644
--- a/pkgs/development/python-modules/telethon/default.nix
+++ b/pkgs/development/python-modules/telethon/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "telethon";
-  version = "1.5.5";
+  version = "1.6.2";
 
   src = fetchPypi {
     inherit version;
     pname = "Telethon";
-    sha256 = "1qpc4vc3lidhlp1c7521nxizjr6y5c3l9x41knqv02x8n3l9knxa";
+    sha256 = "074h5gj0c330rb1nxzpqm31fp1vw7calh1cdkapbjx90j769iz18";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/servers/mautrix-telegram/default.nix b/pkgs/servers/mautrix-telegram/default.nix
index 9aa4fc24e4bf..07c397b84e22 100644
--- a/pkgs/servers/mautrix-telegram/default.nix
+++ b/pkgs/servers/mautrix-telegram/default.nix
@@ -1,30 +1,16 @@
-{ lib, fetchpatch, python3 }:
+{ lib, python3 }:
 
 with python3.pkgs;
 
 buildPythonPackage rec {
   pname = "mautrix-telegram";
-  version = "0.4.0.post1";
+  version = "0.5.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "7a51e55a7f362013ce1cce7d850c65dc8d4651dd05c63004429bc521b461d029";
+    sha256 = "3d5156f205b94dbac76f7eafb0ca732ba16fa568d4440210f7dd4be5c3252dda";
   };
 
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/tulir/mautrix-telegram/commit/a258c59ca3558ad91b1fee190c624763ca835d2f.patch";
-      sha256 = "04z4plsmqmg38rsw9irp5xc9wdgjvg6xba69mixi5v82h9lg3zzp";
-    })
-
-    ./fix_patch_conflicts.patch
-
-    (fetchpatch {
-      url = "https://github.com/tulir/mautrix-telegram/commit/8021fcc24cbf8c88d9bcb2601333863c9615bd4f.patch";
-      sha256 = "0cdfv8ggnjdwdhls1lk6498b233lvnb6175xbxr206km5mxyvqyk";
-    })
-  ];
-
   propagatedBuildInputs = [
     aiohttp
     mautrix-appservice
@@ -36,10 +22,16 @@ buildPythonPackage rec {
     python_magic
     telethon
     telethon-session-sqlalchemy
+    pillow
+    lxml
   ];
 
-  # No tests available
-  doCheck = false;
+  checkInputs = [
+    pytest
+    pytestrunner
+    pytest-mock
+    pytest-asyncio
+  ];
 
   meta = with lib; {
     homepage = https://github.com/tulir/mautrix-telegram;
diff --git a/pkgs/servers/mautrix-telegram/fix_patch_conflicts.patch b/pkgs/servers/mautrix-telegram/fix_patch_conflicts.patch
deleted file mode 100644
index 99c902ce03b7..000000000000
--- a/pkgs/servers/mautrix-telegram/fix_patch_conflicts.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/mautrix_telegram/abstract_user.py b/mautrix_telegram/abstract_user.py
-index 11273f8..aadaf5d 100644
---- a/mautrix_telegram/abstract_user.py
-+++ b/mautrix_telegram/abstract_user.py
-@@ -21,14 +21,14 @@ import logging
- import platform
- 
- from sqlalchemy import orm
--from telethon.tl.types import Channel, ChannelForbidden, Chat, ChatForbidden, Message, \
--    MessageActionChannelMigrateFrom, MessageService, PeerUser, TypeUpdate, \
--    UpdateChannelPinnedMessage, UpdateChatAdmins, UpdateChatParticipantAdmin, \
--    UpdateChatParticipants, UpdateChatUserTyping, UpdateDeleteChannelMessages, \
--    UpdateDeleteMessages, UpdateEditChannelMessage, UpdateEditMessage, UpdateNewChannelMessage, \
--    UpdateNewMessage, UpdateReadHistoryOutbox, UpdateShortChatMessage, UpdateShortMessage, \
--    UpdateUserName, UpdateUserPhoto, UpdateUserStatus, UpdateUserTyping, User, UserStatusOffline, \
--    UserStatusOnline
-+from telethon.tl.patched import MessageService, Message
-+from telethon.tl.types import (
-+    Channel, ChannelForbidden, Chat, ChatForbidden, MessageActionChannelMigrateFrom, PeerUser,
-+    TypeUpdate, UpdateChannelPinnedMessage, UpdateChatAdmins, UpdateChatParticipantAdmin,
-+    UpdateChatParticipants, UpdateChatUserTyping, UpdateDeleteChannelMessages, UpdateDeleteMessages,
-+    UpdateEditChannelMessage, UpdateEditMessage, UpdateNewChannelMessage, UpdateNewMessage,
-+    UpdateReadHistoryOutbox, UpdateShortChatMessage, UpdateShortMessage, UpdateUserName,
-+    UpdateUserPhoto, UpdateUserStatus, UpdateUserTyping, User, UserStatusOffline, UserStatusOnline)
- 
- from mautrix_appservice import MatrixRequestError, AppService
- from alchemysession import AlchemySessionContainer