From e2859068b194c812235690322e9c144273ad2380 Mon Sep 17 00:00:00 2001 From: Eric Wolf Date: Sat, 10 Feb 2018 14:15:18 +0100 Subject: [PATCH] pythonPackages.msgpack: renamed to msgpack-python --- .../networking/instant-messengers/pybitmessage/default.nix | 2 +- pkgs/development/python-modules/locustio/default.nix | 4 ++-- pkgs/servers/matrix-synapse/default.nix | 2 +- pkgs/tools/backup/borg/default.nix | 2 +- pkgs/top-level/python-packages.nix | 6 +++--- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix b/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix index 0e052e847cc..654c343caa8 100644 --- a/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix +++ b/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix @@ -12,7 +12,7 @@ pythonPackages.buildPythonApplication rec { sha256 = "04sgns9qczzw2152gqdr6bjyy4fmgs26cz8n3qck94l0j51rxhz8"; }; - propagatedBuildInputs = with pythonPackages; [ msgpack pyqt4 numpy pyopencl ] ++ [ openssl ]; + propagatedBuildInputs = with pythonPackages; [ msgpack-python pyqt4 numpy pyopencl ] ++ [ openssl ]; preConfigure = '' # Remove interaction and misleading output diff --git a/pkgs/development/python-modules/locustio/default.nix b/pkgs/development/python-modules/locustio/default.nix index 0e9386f667c..4bc48810e71 100644 --- a/pkgs/development/python-modules/locustio/default.nix +++ b/pkgs/development/python-modules/locustio/default.nix @@ -2,7 +2,7 @@ , fetchPypi , mock , unittest2 -, msgpack +, msgpack-python , requests , flask , gevent @@ -22,7 +22,7 @@ buildPythonPackage rec { sed -i s/"pyzmq=="/"pyzmq>="/ setup.py ''; - propagatedBuildInputs = [ msgpack requests flask gevent pyzmq ]; + propagatedBuildInputs = [ msgpack-python requests flask gevent pyzmq ]; buildInputs = [ mock unittest2 ]; meta = { diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index e499dc5de04..7de011e5866 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -42,7 +42,7 @@ in pythonPackages.buildPythonApplication rec { pydenticon pymacaroons-pynacl pynacl pyopenssl pysaml2 pytz requests signedjson systemd twisted ujson unpaddedbase64 pyyaml matrix-angular-sdk bleach netaddr jinja2 psycopg2 - psutil msgpack lxml matrix-synapse-ldap3 + psutil msgpack-python lxml matrix-synapse-ldap3 phonenumbers jsonschema affinity bcrypt ]; diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix index eb40dfefb83..4f0d24a27d9 100644 --- a/pkgs/tools/backup/borg/default.nix +++ b/pkgs/tools/backup/borg/default.nix @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { lz4 openssl python3Packages.setuptools_scm ] ++ stdenv.lib.optionals stdenv.isLinux [ acl ]; propagatedBuildInputs = with python3Packages; [ - cython msgpack + cython msgpack-python ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ llfuse ]; preConfigure = '' diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2263fb29ecd..811af95afdf 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3642,7 +3642,7 @@ in { buildInputs = with self; [ pytest docutils ]; propagatedBuildInputs = with self; [ - dask six boto3 s3fs tblib locket msgpack click cloudpickle tornado + dask six boto3 s3fs tblib locket msgpack-python click cloudpickle tornado psutil botocore zict lz4 sortedcollections sortedcontainers ] ++ (if !isPy3k then [ singledispatch ] else []); @@ -10551,7 +10551,7 @@ in { }; }; - msgpack = buildPythonPackage rec { + msgpack-python = buildPythonPackage rec { name = "msgpack-python-${version}"; version = "0.4.7"; @@ -20440,7 +20440,7 @@ EOF # which we cannot add because of circular dependency. doCheck = false; - propagatedBuildInputs = with self; [ msgpack ] + propagatedBuildInputs = with self; [ msgpack-python ] ++ optional (!isPyPy) greenlet ++ optional (pythonOlder "3.4") trollius;