git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #56193 from nyanloutre/mautrix-update

mautrix-telegram: 0.4.0.post1 -> 0.5.0

commitf0888669451889fbf33ce1a2905e5f6e4a92f1fe authorRobert Schütz <rschuetz17@gmail.com> dateWed 20 Mar 2019, 12:24 (8 years ago) parentf2f577c2fd5f71
4 files changed+15−50
pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix+2−2 pkgs/development/python-modules/telethon/default.nix+2−2 pkgs/servers/mautrix-telegram/default.nix+11−19 pkgs/servers/mautrix-telegram/fix_patch_conflicts.patch−27
pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix+2−2
@@ -2,13 +2,13 @@
22
33buildPythonPackage rec {
44 pname = "telethon-session-sqlalchemy";
5− version = "0.2.9.post1";
5+ version = "0.2.14";
66
77 disabled = !isPy3k;
88
99 src = fetchPypi {
1010 inherit pname version;
11− sha256 = "bbe6a8ca32dd42aa1830b91f08f0458d728dc9eedca0ca27814a34c0b566100e";
11+ sha256 = "94aaf98afc051b4e167783f3d972bd9b51ab736a1e45df100bf52984e53eebac";
1212 };
1313
1414 propagatedBuildInputs = [
pkgs/development/python-modules/telethon/default.nix+2−2
@@ -2,12 +2,12 @@
22
33buildPythonPackage rec {
44 pname = "telethon";
5− version = "1.5.5";
5+ version = "1.6.2";
66
77 src = fetchPypi {
88 inherit version;
99 pname = "Telethon";
10− sha256 = "1qpc4vc3lidhlp1c7521nxizjr6y5c3l9x41knqv02x8n3l9knxa";
10+ sha256 = "074h5gj0c330rb1nxzpqm31fp1vw7calh1cdkapbjx90j769iz18";
1111 };
1212
1313 propagatedBuildInputs = [
pkgs/servers/mautrix-telegram/default.nix+11−19
@@ -1,30 +1,16 @@
1−{ lib, fetchpatch, python3 }:
1+{ lib, python3 }:
22
33with python3.pkgs;
44
55buildPythonPackage rec {
66 pname = "mautrix-telegram";
7− version = "0.4.0.post1";
7+ version = "0.5.0";
88
99 src = fetchPypi {
1010 inherit pname version;
11− sha256 = "7a51e55a7f362013ce1cce7d850c65dc8d4651dd05c63004429bc521b461d029";
11+ sha256 = "3d5156f205b94dbac76f7eafb0ca732ba16fa568d4440210f7dd4be5c3252dda";
1212 };
1313
14− patches = [
15− (fetchpatch {
16− url = "https://github.com/tulir/mautrix-telegram/commit/a258c59ca3558ad91b1fee190c624763ca835d2f.patch";
17− sha256 = "04z4plsmqmg38rsw9irp5xc9wdgjvg6xba69mixi5v82h9lg3zzp";
18− })
19−
20− ./fix_patch_conflicts.patch
21−
22− (fetchpatch {
23− url = "https://github.com/tulir/mautrix-telegram/commit/8021fcc24cbf8c88d9bcb2601333863c9615bd4f.patch";
24− sha256 = "0cdfv8ggnjdwdhls1lk6498b233lvnb6175xbxr206km5mxyvqyk";
25− })
26− ];
27−
2814 propagatedBuildInputs = [
2915 aiohttp
3016 mautrix-appservice
@@ -36,10 +22,16 @@ buildPythonPackage rec {
3622 python_magic
3723 telethon
3824 telethon-session-sqlalchemy
25+ pillow
26+ lxml
3927 ];
4028
41− # No tests available
42− doCheck = false;
29+ checkInputs = [
30+ pytest
31+ pytestrunner
32+ pytest-mock
33+ pytest-asyncio
34+ ];
4335
4436 meta = with lib; {
4537 homepage = https://github.com/tulir/mautrix-telegram;
pkgs/servers/mautrix-telegram/fix_patch_conflicts.patchdeleted−27
@@ -1,27 +0,0 @@
1−diff --git a/mautrix_telegram/abstract_user.py b/mautrix_telegram/abstract_user.py
2−index 11273f8..aadaf5d 100644
3−--- a/mautrix_telegram/abstract_user.py
4−+++ b/mautrix_telegram/abstract_user.py
5−@@ -21,14 +21,14 @@ import logging
6− import platform
7−
8− from sqlalchemy import orm
9−-from telethon.tl.types import Channel, ChannelForbidden, Chat, ChatForbidden, Message, \
10−- MessageActionChannelMigrateFrom, MessageService, PeerUser, TypeUpdate, \
11−- UpdateChannelPinnedMessage, UpdateChatAdmins, UpdateChatParticipantAdmin, \
12−- UpdateChatParticipants, UpdateChatUserTyping, UpdateDeleteChannelMessages, \
13−- UpdateDeleteMessages, UpdateEditChannelMessage, UpdateEditMessage, UpdateNewChannelMessage, \
14−- UpdateNewMessage, UpdateReadHistoryOutbox, UpdateShortChatMessage, UpdateShortMessage, \
15−- UpdateUserName, UpdateUserPhoto, UpdateUserStatus, UpdateUserTyping, User, UserStatusOffline, \
16−- UserStatusOnline
17−+from telethon.tl.patched import MessageService, Message
18−+from telethon.tl.types import (
19−+ Channel, ChannelForbidden, Chat, ChatForbidden, MessageActionChannelMigrateFrom, PeerUser,
20−+ TypeUpdate, UpdateChannelPinnedMessage, UpdateChatAdmins, UpdateChatParticipantAdmin,
21−+ UpdateChatParticipants, UpdateChatUserTyping, UpdateDeleteChannelMessages, UpdateDeleteMessages,
22−+ UpdateEditChannelMessage, UpdateEditMessage, UpdateNewChannelMessage, UpdateNewMessage,
23−+ UpdateReadHistoryOutbox, UpdateShortChatMessage, UpdateShortMessage, UpdateUserName,
24−+ UpdateUserPhoto, UpdateUserStatus, UpdateUserTyping, User, UserStatusOffline, UserStatusOnline)
25−
26− from mautrix_appservice import MatrixRequestError, AppService
27− from alchemysession import AlchemySessionContainer