mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-28 18:03:04 +00:00
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!
This commit is contained in:
parent
d2ccabaeea
commit
22aef72ff1
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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 = ''
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
||||
|
@ -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 { };
|
||||
|
Loading…
Reference in New Issue
Block a user