From 0a94f89fca3182cde82c91400db35e542215af97 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 14 Apr 2019 12:02:26 +0200 Subject: [PATCH] mautrix-telegram: patch away alembic dependency `alembic`[1] is a database migration tool which is invoked from the CLI when installing the telegram bridge, but never needed during the runtime. The reason why `alembic` is required here is to ensure that it exists in the Python environment when deploying the bridge. However `alembic` requires `mautrix-telegram` in its environment to create a database schema from the Python models. Such a dependency relation may be possible with tools like virtualenv, however it'll result in an infinite recursion at evaluation time in Nix. With this patch, `mautrix-telegram` doesn't depend on `alembic` anymore and provides a patched alembic (`pkgs.mautrix-telegram.alembic`) which has `mautrix-telegram` in its path. [1] https://alembic.sqlalchemy.org/en/latest/ --- pkgs/servers/mautrix-telegram/default.nix | 22 +++++++++++++++++++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/mautrix-telegram/default.nix b/pkgs/servers/mautrix-telegram/default.nix index 7c50c9cb27b8..1cf011fb167a 100644 --- a/pkgs/servers/mautrix-telegram/default.nix +++ b/pkgs/servers/mautrix-telegram/default.nix @@ -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 ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 768672181439..a5f603864e2c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3908,7 +3908,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 { };