diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-09-29 10:34:30 +0200 |
---|---|---|
committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2019-09-29 11:01:58 +0200 |
commit | 22aef72ff132f59f3f3a00614912394b59de32f1 (patch) | |
tree | ddcf23babbb5848dcd0193a4de0fd622065a1fec /pkgs | |
parent | d2ccabaeeacc9d5353a7387a8b2c60db4bd98fd8 (diff) |
python: get rid of msgpack-python, fixes #48864
We already have msgpack, which is the same. Building a Python env with
`spacy` resulted in a collision between an `.so` provided through both
`msgpack` and `msgpack-python`.
I don't know why `transitional = True` was set. These kind of things
should be documented!
Diffstat (limited to 'pkgs')
8 files changed, 13 insertions, 20 deletions
diff --git a/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix b/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix index 3f6b23d70a05..ea3ef08a2cdf 100644 --- a/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix +++ b/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix @@ -12,7 +12,7 @@ python2Packages.buildPythonApplication rec { sha256 = "1lmhbpwsqh1v93krlqqhafw2pc3y0qp8zby186yllbph6s8kdp35"; }; - propagatedBuildInputs = with python2Packages; [ msgpack-python pyqt4 numpy pyopencl ] ++ [ openssl ]; + propagatedBuildInputs = with python2Packages; [ msgpack pyqt4 numpy pyopencl ] ++ [ openssl ]; preConfigure = '' # Remove interaction and misleading output diff --git a/pkgs/development/python-modules/cachy/default.nix b/pkgs/development/python-modules/cachy/default.nix index 029a18644846..d5c3428fcc1f 100644 --- a/pkgs/development/python-modules/cachy/default.nix +++ b/pkgs/development/python-modules/cachy/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, fetchPypi , redis , memcached -, msgpack-python +, msgpack }: buildPythonPackage rec { @@ -16,7 +16,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ redis memcached - msgpack-python + msgpack ]; # The Pypi tarball doesn't include tests, and the GitHub source isn't diff --git a/pkgs/development/python-modules/intake/default.nix b/pkgs/development/python-modules/intake/default.nix index f89b7ab1ce62..f670d8f01e07 100644 --- a/pkgs/development/python-modules/intake/default.nix +++ b/pkgs/development/python-modules/intake/default.nix @@ -7,7 +7,7 @@ , hvplot , jinja2 , msgpack-numpy -, msgpack-python +, msgpack , numpy , pandas , panel @@ -39,7 +39,7 @@ buildPythonPackage rec { hvplot jinja2 msgpack-numpy - msgpack-python + msgpack numpy pandas panel diff --git a/pkgs/development/python-modules/monty/default.nix b/pkgs/development/python-modules/monty/default.nix index 4675a3860549..677cb68ca501 100644 --- a/pkgs/development/python-modules/monty/default.nix +++ b/pkgs/development/python-modules/monty/default.nix @@ -5,7 +5,7 @@ , numpy , six , ruamel_yaml -, msgpack-python +, msgpack , coverage , coveralls , pymongo @@ -24,7 +24,7 @@ buildPythonPackage rec { sha256 = "0vqaaz0dw0ypl6sfwbycpb0qs3ap04c4ghbggklxih66spdlggh6"; }; - checkInputs = [ lsof nose numpy msgpack-python coverage coveralls pymongo]; + checkInputs = [ lsof nose numpy msgpack coverage coveralls pymongo]; propagatedBuildInputs = [ six ruamel_yaml ]; preCheck = '' diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index aff670e5dfe6..441c656a0e1e 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -15,7 +15,7 @@ , regex , cymem , pathlib -, msgpack-python +, msgpack , msgpack-numpy , jsonschema , blis @@ -50,7 +50,7 @@ buildPythonPackage rec { requests regex ftfy - msgpack-python + msgpack msgpack-numpy jsonschema blis diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix index ac8ab3fd8648..945da85b9fab 100644 --- a/pkgs/development/python-modules/thinc/default.nix +++ b/pkgs/development/python-modules/thinc/default.nix @@ -8,7 +8,7 @@ , cymem , darwin , msgpack-numpy -, msgpack-python +, msgpack , preshed , numpy , murmurhash @@ -44,7 +44,7 @@ buildPythonPackage rec { cython cymem msgpack-numpy - msgpack-python + msgpack preshed numpy murmurhash diff --git a/pkgs/development/python-modules/zerorpc/default.nix b/pkgs/development/python-modules/zerorpc/default.nix index 2ad01586189b..bbd7bc8aba27 100644 --- a/pkgs/development/python-modules/zerorpc/default.nix +++ b/pkgs/development/python-modules/zerorpc/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, future, gevent, msgpack-python, pyzmq }: +{ lib, buildPythonPackage, fetchPypi, future, gevent, msgpack, pyzmq }: buildPythonPackage rec { pname = "zerorpc"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "14d0nmprs0nm17d8kg2f7qalsi8x7c4damsccqgncylj7mpnk9hh"; }; - propagatedBuildInputs = [ future gevent msgpack-python pyzmq ]; + propagatedBuildInputs = [ future gevent msgpack pyzmq ]; doCheck = false; # pypi version doesn't include tests diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 143619aeb14c..d08bb33f34ed 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3836,13 +3836,6 @@ in { msgpack-numpy = callPackage ../development/python-modules/msgpack-numpy {}; - msgpack-python = self.msgpack.overridePythonAttrs { - pname = "msgpack-python"; - postPatch = '' - substituteInPlace setup.py --replace "TRANSITIONAL = False" "TRANSITIONAL = True" - ''; - }; - msrplib = callPackage ../development/python-modules/msrplib { }; multipledispatch = callPackage ../development/python-modules/multipledispatch { }; |