Merge commit '1a57d96edd156958b12782e8c8b6a374142a7248'

1 files changed, 10 insertions, 11 deletions

diff --git a/nixpkgs/pkgs/development/python-modules/celery/default.nix b/nixpkgs/pkgs/development/python-modules/celery/default.nix
index 3fd1b51a4660..3ba06c92a5ce 100644
--- a/nixpkgs/pkgs/development/python-modules/celery/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/celery/default.nix
@@ -1,24 +1,26 @@
-{ lib, buildPythonPackage, fetchPypi, libredirect
-, case, pytest, boto3, moto, kombu, billiard, pytz, future, vine
+{ lib, buildPythonPackage, fetchPypi
+, billiard, click, click-didyoumean, click-repl, kombu, pytz, vine
+, boto3, case, moto, pytest, pytest-celery, pytest-subtests, pytest-timeout
 }:
 
 buildPythonPackage rec {
   pname = "celery";
-  version = "4.4.7";
+  version = "5.0.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d220b13a8ed57c78149acf82c006785356071844afe0b27012a4991d44026f9f";
+    sha256 = "012c814967fe89e3f5d2cf49df2dba3de5f29253a7f4f2270e8fce6b901b4ebf";
   };
 
   postPatch = ''
-    substituteInPlace requirements/default.txt \
-      --replace "kombu>=4.6.10,<4.7" "kombu"
     substituteInPlace requirements/test.txt \
-      --replace "moto==1.3.7" moto \
-      --replace "pytest>=4.3.1,<4.4.0" pytest
+      --replace "moto==1.3.7" moto
   '';
 
+  propagatedBuildInputs = [ billiard click click-didyoumean click-repl kombu pytz vine ];
+
+  checkInputs = [ boto3 case moto pytest pytest-celery pytest-subtests pytest-timeout ];
+
   # ignore test that's incompatible with pytest5
   # test_eventlet touches network
   # test_mongodb requires pymongo
@@ -32,9 +34,6 @@ buildPythonPackage rec {
       --ignore=t/unit/backends/test_mongodb.py
   '';
 
-  checkInputs = [ case pytest boto3 moto ];
-  propagatedBuildInputs = [ kombu billiard pytz future vine ];
-
   meta = with lib; {
     homepage = "https://github.com/celery/celery/";
     description = "Distributed task queue";