diff options
| author | Philipp Gesang <philipp.gesang@intra2net.com> | 2020-01-13 10:35:05 +0100 |
|---|---|---|
| committer | Philipp Gesang <philipp.gesang@intra2net.com> | 2020-01-13 14:22:45 +0100 |
| commit | 0169b72b6511a82f04c1e5393db8c9477acdd586 (patch) | |
| tree | 204dd5907ce0686b794ecaf022eefb0f0909b737 /pkgs/development/python-modules/python-olm | |
| parent | 9ed03f2103651846807aa0bcd5c4e980eda1d5c9 (diff) | |
| download | nixpkgs-0169b72b6511a82f04c1e5393db8c9477acdd586.tar nixpkgs-0169b72b6511a82f04c1e5393db8c9477acdd586.tar.gz nixpkgs-0169b72b6511a82f04c1e5393db8c9477acdd586.tar.bz2 nixpkgs-0169b72b6511a82f04c1e5393db8c9477acdd586.tar.lz nixpkgs-0169b72b6511a82f04c1e5393db8c9477acdd586.tar.xz nixpkgs-0169b72b6511a82f04c1e5393db8c9477acdd586.tar.zst nixpkgs-0169b72b6511a82f04c1e5393db8c9477acdd586.zip | |
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.
Diffstat (limited to 'pkgs/development/python-modules/python-olm')
| -rw-r--r-- | pkgs/development/python-modules/python-olm/default.nix | 5 |
1 files 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; |