Merge pull request #59519 from Ma27/improve-mautrix-telegram

mautrix-telegram: patch away alembic dependency
This commit is contained in:
Maximilian Bosch 2019-05-30 11:01:20 +02:00 committed by GitHub
commit 5949838975
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 4 deletions

View File

@ -1,4 +1,4 @@
{ lib, python3 }:
{ lib, python3, mautrix-telegram }:
with python3.pkgs;
@ -11,11 +11,15 @@ buildPythonPackage rec {
sha256 = "51951845e52c4ca5410e0f4a51d99014dd6df2fcedfca8b7241e045359cbf112";
};
postPatch = ''
sed -i -e '/alembic>/d' setup.py
'';
propagatedBuildInputs = [
Mako
aiohttp
mautrix-appservice
sqlalchemy
alembic
CommonMark
ruamel_yaml
future-fstrings
@ -26,6 +30,18 @@ buildPythonPackage rec {
lxml
];
# `alembic` (a database migration tool) is only needed for the initial setup,
# and not needed during the actual runtime. However `alembic` requires `mautrix-telegram`
# in its environment to create a database schema from all models.
#
# Hence we need to patch away `alembic` from `mautrix-telegram` and create an `alembic`
# which has `mautrix-telegram` in its environment.
passthru.alembic = alembic.overrideAttrs (old: {
propagatedBuildInputs = old.propagatedBuildInputs ++ [
mautrix-telegram
];
});
checkInputs = [
pytest
pytestrunner
@ -37,6 +53,6 @@ buildPythonPackage rec {
homepage = https://github.com/tulir/mautrix-telegram;
description = "A Matrix-Telegram hybrid puppeting/relaybot bridge";
license = licenses.agpl3Plus;
maintainers = with maintainers; [ nyanloutre ];
maintainers = with maintainers; [ nyanloutre ma27 ];
};
}

View File

@ -4082,7 +4082,7 @@ in
matrix-synapse = callPackage ../servers/matrix-synapse { };
mautrix-telegram = callPackage ../servers/mautrix-telegram { };
mautrix-telegram = recurseIntoAttrs (callPackage ../servers/mautrix-telegram { });
mautrix-whatsapp = callPackage ../servers/mautrix-whatsapp { };