From 0169b72b6511a82f04c1e5393db8c9477acdd586 Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Mon, 13 Jan 2020 10:35:05 +0100 Subject: [PATCH] python3Packages.python-olm: remove dependency on the typing package Typing has been upstreamed into CPython and will cause errors if loaded with a 3.7 interpreter. Cf. https://github.com/python/typing/issues/573 Under Python3 libolm works without typing as tested via weechat-matrix. typing is still pulled in when installed for Python2. --- pkgs/development/python-modules/python-olm/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/python-olm/default.nix b/pkgs/development/python-modules/python-olm/default.nix index 4fc0ad66f95..b1e01f7f4ab 100644 --- a/pkgs/development/python-modules/python-olm/default.nix +++ b/pkgs/development/python-modules/python-olm/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, olm, - cffi, future, typing }: + cffi, future, isPy3k, typing }: buildPythonPackage { pname = "python-olm"; @@ -15,8 +15,7 @@ buildPythonPackage { propagatedBuildInputs = [ cffi future - typing - ]; + ] ++ lib.optionals (!isPy3k) [ typing ]; doCheck = false;