diff options
author | nyanloutre <paul@nyanlout.re> | 2019-02-20 14:07:37 +0100 |
---|---|---|
committer | nyanloutre <paul@nyanlout.re> | 2019-03-20 11:42:27 +0100 |
commit | 3fa5e2bab6b13adcf5b42514bdae4156f3258c53 (patch) | |
tree | 81234ed844bed94d0ab61172542330c2350e7eac /pkgs/servers/mautrix-telegram | |
parent | 0f266d1e4caa82eaf906e9a20239dbb6fd9def19 (diff) |
mautrix-telegram: 0.4.0.post1 -> 0.5.0
Diffstat (limited to 'pkgs/servers/mautrix-telegram')
-rw-r--r-- | pkgs/servers/mautrix-telegram/default.nix | 30 | ||||
-rw-r--r-- | pkgs/servers/mautrix-telegram/fix_patch_conflicts.patch | 27 |
2 files changed, 11 insertions, 46 deletions
diff --git a/pkgs/servers/mautrix-telegram/default.nix b/pkgs/servers/mautrix-telegram/default.nix index 9aa4fc24e4bf5..07c397b84e226 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 99c902ce03b7d..0000000000000 --- 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 |