diff options
author | Maximilian Bosch <maximilian@mbosch.me> | 2021-11-17 17:17:15 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-17 17:17:15 +0100 |
commit | d7f74f982f5ddf12273cf14cfcdb48a1c6412831 (patch) | |
tree | 62e17dca30f17a805b7dca22a997f45dfcde237b /pkgs/servers | |
parent | 4d3404ac25e47a3f8dc516a0c65c15ad47e28d45 (diff) | |
parent | cd75f6b2378fd60d69580073fd7567437bc8065e (diff) |
Merge pull request #145757 from Ma27/bump-mautrix-pkgs
mautrix-telegram: 0.10.1 -> 0.10.2, mautrix-signal: unstable-2021-08-12 -> unstable-2021-11-12, python3Packages.mautrix: 0.10.11 -> 0.11.3
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/mautrix-signal/default.nix | 12 | ||||
-rw-r--r-- | pkgs/servers/mautrix-telegram/default.nix | 22 |
2 files changed, 22 insertions, 12 deletions
diff --git a/pkgs/servers/mautrix-signal/default.nix b/pkgs/servers/mautrix-signal/default.nix index 012f54361f988..6b11b386421e6 100644 --- a/pkgs/servers/mautrix-signal/default.nix +++ b/pkgs/servers/mautrix-signal/default.nix @@ -2,13 +2,13 @@ python3.pkgs.buildPythonPackage rec { pname = "mautrix-signal"; - version = "unstable-2021-08-12"; + version = "unstable-2021-11-12"; src = fetchFromGitHub { - owner = "tulir"; - repo = "mautrix-signal"; - rev = "a592baaaa6c9ab7ec29edc84f069b9e9e2fc1b03"; - sha256 = "0rvidf4ah23x8m7k7hbkwm2xrs838wnli99gh99b5hr6fqmacbwl"; + owner = "mautrix"; + repo = "signal"; + rev = "2e57810e964c1701df2e69273c2f8cebbe021464"; + sha256 = "sha256-xgn01nbY3LR4G1Yk2MgUhq116/wEhG+5vLH6HKqZE+8="; }; propagatedBuildInputs = with python3.pkgs; [ @@ -46,7 +46,7 @@ python3.pkgs.buildPythonPackage rec { ''; meta = with lib; { - homepage = "https://github.com/tulir/mautrix-signal"; + homepage = "https://github.com/mautrix/signal"; description = "A Matrix-Signal puppeting bridge"; license = licenses.agpl3Plus; platforms = platforms.linux; diff --git a/pkgs/servers/mautrix-telegram/default.nix b/pkgs/servers/mautrix-telegram/default.nix index ab0564b2cf196..33b9d1d400dbf 100644 --- a/pkgs/servers/mautrix-telegram/default.nix +++ b/pkgs/servers/mautrix-telegram/default.nix @@ -12,25 +12,35 @@ let sha256 = "ebbb777cbf9312359b897bf81ba00dae0f5cb69fba2a18265dcc18a6f5ef7519"; }; }); + + tulir-telethon = self.telethon.overridePythonAttrs (oldAttrs: rec { + version = "1.24.0a2"; + pname = "tulir-telethon"; + src = oldAttrs.src.override { + inherit pname version; + sha256 = "sha256-Qbx164FwC8nhesoY2fkaKvErN8g0Ph8vGcx+Cc1AqRg="; + }; + }); }; }; # officially supported database drivers dbDrivers = with python.pkgs; [ psycopg2 + aiosqlite # sqlite driver is already shipped with python by default ]; in python.pkgs.buildPythonPackage rec { pname = "mautrix-telegram"; - version = "0.10.1"; + version = "0.10.2"; disabled = python.pythonOlder "3.7"; src = fetchFromGitHub { - owner = "tulir"; - repo = pname; + owner = "mautrix"; + repo = "telegram"; rev = "v${version}"; - sha256 = "sha256-1Dmc7WRlT2ivGkdrGDC1b44DE0ovQKfUR0gDiQE4h5c="; + sha256 = "sha256-BYsGLyxhdjBVmnZXLC5ZjwDlWcHdUGp+DsNIOXA1/Tc="; }; patches = [ ./0001-Re-add-entrypoint.patch ./0002-Don-t-depend-on-pytest-runner.patch ]; @@ -49,7 +59,7 @@ in python.pkgs.buildPythonPackage rec { CommonMark ruamel-yaml python_magic - telethon + tulir-telethon telethon-session-sqlalchemy pillow lxml @@ -87,7 +97,7 @@ in python.pkgs.buildPythonPackage rec { ]; meta = with lib; { - homepage = "https://github.com/tulir/mautrix-telegram"; + homepage = "https://github.com/mautrix/telegram"; description = "A Matrix-Telegram hybrid puppeting/relaybot bridge"; license = licenses.agpl3Plus; platforms = platforms.linux; |