From 0be9f1b3e511dd43c3ed75ad0e31bbac9b5e71e3 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Wed, 18 Jan 2017 14:19:52 +0100 Subject: [PATCH] pythonPackages.billiard: 3.3.0.23 -> 3.5.0.2 --- pkgs/top-level/python-packages.nix | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 70ce93f663c..818adea68e3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2668,8 +2668,7 @@ in { }; }; - - billiard = buildPythonPackage rec { + billiard_33 = buildPythonPackage rec { name = "billiard-${version}"; version = "3.3.0.23"; @@ -2689,6 +2688,26 @@ in { }; }; + billiard = buildPythonPackage rec { + name = "billiard-${version}"; + version = "3.5.0.2"; + + disabled = isPyPy; + + src = pkgs.fetchurl { + url = "mirror://pypi/b/billiard/${name}.tar.gz"; + sha256 = "1anw68rkja1dbgvndxz5mq6f89hmxwaha0fjcdnsl5j1wj7imc1y"; + }; + + buildInputs = with self; [ pytest_30 case ]; + + meta = { + homepage = https://github.com/celery/billiard; + description = "Python multiprocessing fork with improvements and bugfixes"; + license = licenses.bsd3; + }; + }; + binaryornot = buildPythonPackage rec { name = "binaryornot-${version}"; @@ -3575,7 +3594,7 @@ in { }; buildInputs = with self; [ mock nose unittest2 ]; - propagatedBuildInputs = with self; [ kombu billiard pytz anyjson amqp_1 ]; + propagatedBuildInputs = with self; [ kombu billiard_33 pytz anyjson amqp_1 ]; checkPhase = '' nosetests $out/${python.sitePackages}/celery/tests/