public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

python: get rid of msgpack-python, fixes #48864

Browse Source 
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:
Frederik Rietdijk 2019-09-29 10:34:30 +02:00 committed by Frederik Rietdijk
parent d2ccabaeea
commit 22aef72ff1
8 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/networking/instant-messengers/pybitmessage/default.nix
View File

@ -12,7 +12,7 @@ python2Packages.buildPythonApplication rec {
sha256 = "1lmhbpwsqh1v93krlqqhafw2pc3y0qp8zby186yllbph6s8kdp35"; sha256 = "1lmhbpwsqh1v93krlqqhafw2pc3y0qp8zby186yllbph6s8kdp35";
}; };
propagatedBuildInputs = with python2Packages; [ msgpack-python pyqt4 numpy pyopencl ] ++ [ openssl ]; propagatedBuildInputs = with python2Packages; [ msgpack pyqt4 numpy pyopencl ] ++ [ openssl ];
preConfigure = '' preConfigure = ''
# Remove interaction and misleading output # Remove interaction and misleading output

4
pkgs/development/python-modules/cachy/default.nix
View File

@ -1,7 +1,7 @@
{ lib, buildPythonPackage, fetchPypi { lib, buildPythonPackage, fetchPypi
, redis , redis
, memcached , memcached
, msgpack-python , msgpack
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -16,7 +16,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ propagatedBuildInputs = [
redis redis
memcached memcached
msgpack-python msgpack
]; ];
# The Pypi tarball doesn't include tests, and the GitHub source isn't # The Pypi tarball doesn't include tests, and the GitHub source isn't

4
pkgs/development/python-modules/intake/default.nix
View File

@ -7,7 +7,7 @@
, hvplot , hvplot
, jinja2 , jinja2
, msgpack-numpy , msgpack-numpy
, msgpack-python , msgpack
, numpy , numpy
, pandas , pandas
, panel , panel
@ -39,7 +39,7 @@ buildPythonPackage rec {
hvplot hvplot
jinja2 jinja2
msgpack-numpy msgpack-numpy
msgpack-python msgpack
numpy numpy
pandas pandas
panel panel

4
pkgs/development/python-modules/monty/default.nix
View File

@ -5,7 +5,7 @@
, numpy , numpy
, six , six
, ruamel_yaml , ruamel_yaml
, msgpack-python , msgpack
, coverage , coverage
, coveralls , coveralls
, pymongo , pymongo
@ -24,7 +24,7 @@ buildPythonPackage rec {
sha256 = "0vqaaz0dw0ypl6sfwbycpb0qs3ap04c4ghbggklxih66spdlggh6"; sha256 = "0vqaaz0dw0ypl6sfwbycpb0qs3ap04c4ghbggklxih66spdlggh6";
}; };
checkInputs = [ lsof nose numpy msgpack-python coverage coveralls pymongo]; checkInputs = [ lsof nose numpy msgpack coverage coveralls pymongo];
propagatedBuildInputs = [ six ruamel_yaml ]; propagatedBuildInputs = [ six ruamel_yaml ];
preCheck = '' preCheck = ''

4
pkgs/development/python-modules/spacy/default.nix
View File

@ -15,7 +15,7 @@
, regex , regex
, cymem , cymem
, pathlib , pathlib
, msgpack-python , msgpack
, msgpack-numpy , msgpack-numpy
, jsonschema , jsonschema
, blis , blis
@ -50,7 +50,7 @@ buildPythonPackage rec {
requests requests
regex regex
ftfy ftfy
msgpack-python msgpack
msgpack-numpy msgpack-numpy
jsonschema jsonschema
blis blis

4
pkgs/development/python-modules/thinc/default.nix
View File

@ -8,7 +8,7 @@
, cymem , cymem
, darwin , darwin
, msgpack-numpy , msgpack-numpy
, msgpack-python , msgpack
, preshed , preshed
, numpy , numpy
, murmurhash , murmurhash
@ -44,7 +44,7 @@ buildPythonPackage rec {
cython cython
cymem cymem
msgpack-numpy msgpack-numpy
msgpack-python msgpack
preshed preshed
numpy numpy
murmurhash murmurhash

4
pkgs/development/python-modules/zerorpc/default.nix
View File

@ -1,4 +1,4 @@
{ lib, buildPythonPackage, fetchPypi, future, gevent, msgpack-python, pyzmq }: { lib, buildPythonPackage, fetchPypi, future, gevent, msgpack, pyzmq }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "zerorpc"; pname = "zerorpc";
@ -9,7 +9,7 @@ buildPythonPackage rec {
sha256 = "14d0nmprs0nm17d8kg2f7qalsi8x7c4damsccqgncylj7mpnk9hh"; sha256 = "14d0nmprs0nm17d8kg2f7qalsi8x7c4damsccqgncylj7mpnk9hh";
}; };
propagatedBuildInputs = [ future gevent msgpack-python pyzmq ]; propagatedBuildInputs = [ future gevent msgpack pyzmq ];
doCheck = false; # pypi version doesn't include tests doCheck = false; # pypi version doesn't include tests

7
pkgs/top-level/python-packages.nix
View File

@ -3836,13 +3836,6 @@ in {
msgpack-numpy = callPackage ../development/python-modules/msgpack-numpy {}; 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 { }; msrplib = callPackage ../development/python-modules/msrplib { };
multipledispatch = callPackage ../development/python-modules/multipledispatch { }; multipledispatch = callPackage ../development/python-modules/multipledispatch { };