From e823bb582a22b8d28e36fb07dc75658591a1ad74 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 11 Jun 2023 22:49:38 +0200
Subject: [PATCH] python310Packages.celery: 5.2.7 -> 5.3.0

https://github.com/celery/celery/releases/tag/v5.3.0
https://github.com/celery/celery/blob/v5.3.0/Changelog.rst
---
 .../python-modules/celery/default.nix         | 35 +++++++------------
 1 file changed, 12 insertions(+), 23 deletions(-)

diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix
index 52fcaad47adf..836c270a4c03 100644
--- a/pkgs/development/python-modules/celery/default.nix
+++ b/pkgs/development/python-modules/celery/default.nix
@@ -1,5 +1,6 @@
 { stdenv
 , lib
+, backports-zoneinfo
 , billiard
 , boto3
 , buildPythonPackage
@@ -10,50 +11,33 @@
 , click-repl
 , dnspython
 , fetchPypi
-, fetchpatch
 , kombu
 , moto
 , pymongo
 , pytest-celery
+, pytest-click
 , pytest-subtests
 , pytest-timeout
 , pytestCheckHook
+, python-dateutil
 , pythonOlder
-, pytz
+, tzdata
 , vine
 , nixosTests
 }:
 
 buildPythonPackage rec {
   pname = "celery";
-  version = "5.2.7";
+  version = "5.3.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-+vvYKTTTD4oAT4Ho96Bi4xQToj1ES+juMyZVORWVjG0=";
+    hash = "sha256-Hqul7hTYyMC+2PYGPl4Q2r288jUDqGHPDhC3Ih2Zyw0=";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "billiard-4.0-compat.patch";
-      url = "https://github.com/celery/celery/commit/b260860988469ef8ad74f2d4225839c2fa91d590.patch";
-      hash = "sha256-NWB/UB0fE7A/vgMRYz6QGmqLmyN1ninAMyL4V2tpzto=";
-    })
-    (fetchpatch  {
-      name = "billiard-4.1-compat.patch";
-      url = "https://github.com/celery/celery/pull/7781/commits/879af6341974c3778077d8212d78f093b2d77a4f.patch";
-      hash = "sha256-+m8/YkeAPPjwm0WF7dw5XZzf7MImVBLXT0/FS+fk0FE=";
-    })
-  ];
-
-  postPatch = ''
-    substituteInPlace requirements/default.txt \
-      --replace "billiard>=3.6.4.0,<4.0" "billiard>=3.6.4.0"
-  '';
-
   propagatedBuildInputs = [
     billiard
     click
@@ -61,8 +45,12 @@ buildPythonPackage rec {
     click-plugins
     click-repl
     kombu
-    pytz
+    python-dateutil
+    tzdata
     vine
+  ]
+  ++ lib.optionals (pythonOlder "3.9") [
+    backports-zoneinfo
   ];
 
   nativeCheckInputs = [
@@ -72,6 +60,7 @@ buildPythonPackage rec {
     moto
     pymongo
     pytest-celery
+    pytest-click
     pytest-subtests
     pytest-timeout
     pytestCheckHook