summary refs log tree commit diff
path: root/pkgs/servers/mautrix-telegram
diff options
context:
space:
mode:
authorMaximilian Bosch <maximilian@mbosch.me>2019-10-26 10:40:14 +0200
committerMaximilian Bosch <maximilian@mbosch.me>2019-10-26 10:58:56 +0200
commit22470fff35a2b4de1a898175675dace9f627fdeb (patch)
tree15b15aabb38f9da9edca2060c62eda7f2d032173 /pkgs/servers/mautrix-telegram
parente478127e8006aa012cfb960503b42466329e1a9a (diff)
downloadnixpkgs-22470fff35a2b4de1a898175675dace9f627fdeb.tar
nixpkgs-22470fff35a2b4de1a898175675dace9f627fdeb.tar.gz
nixpkgs-22470fff35a2b4de1a898175675dace9f627fdeb.tar.bz2
nixpkgs-22470fff35a2b4de1a898175675dace9f627fdeb.tar.lz
nixpkgs-22470fff35a2b4de1a898175675dace9f627fdeb.tar.xz
nixpkgs-22470fff35a2b4de1a898175675dace9f627fdeb.tar.zst
nixpkgs-22470fff35a2b4de1a898175675dace9f627fdeb.zip
mautrix-telegram: fix build
With updating `pluggy` to `0.13.0`[1] the way how python modules are
imported during pytest changed which broke all modules that had a
`coding: future_fstrings` annotation at the top which used to be needed
for python <=3.5. This only affected the tests, deploying a
`mautrix-telegram` from master with `doCheck = false;` works fine.

I applied a patch for `mautrix-telegram` which drops python 3.5 compat
(this package is intended to be used as application with python 3.7, so this
should be fine on master/unstable) and modified `mautrix-appservice`
accordingly as a lot of things on master changed since their last
release, so applying a patch didn't work there.

Resolves #71996

[1] faf8cfba4ecd86186bb2d965f6d6386a08aba6a6
Diffstat (limited to 'pkgs/servers/mautrix-telegram')
-rw-r--r--pkgs/servers/mautrix-telegram/default.nix11
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/servers/mautrix-telegram/default.nix b/pkgs/servers/mautrix-telegram/default.nix
index 2908c14b4e0..415609e77c2 100644
--- a/pkgs/servers/mautrix-telegram/default.nix
+++ b/pkgs/servers/mautrix-telegram/default.nix
@@ -1,4 +1,4 @@
-{ lib, python3, mautrix-telegram }:
+{ lib, python3, mautrix-telegram, fetchpatch }:
 
 with python3.pkgs;
 
@@ -11,6 +11,15 @@ buildPythonPackage rec {
     sha256 = "1lsi6x5yr8f9yjxsh1rmcd6wnxr6s6rpr720lg7sq629m42d9p1d";
   };
 
+  patches = [
+    (fetchpatch {
+      url = https://github.com/tulir/mautrix-telegram/commit/be6d395ed66d86ec7f13a262f9ae37731987019c.patch;
+      sha256 = "1q69ip17r45yhyrxr0pj8bvqj2grw2l39wak8pi5pm7qrxra93j2";
+    })
+  ];
+
+  disabled = pythonOlder "3.6";
+
   postPatch = ''
     sed -i -e '/alembic>/d' setup.py
   '';