From 5d591948201c7c04c62c3d63b432aeb7e6cf50b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Sat, 14 Jul 2018 13:19:09 +0200
Subject: [PATCH] python.pkgs.kombu: 4.0.2 -> 4.2.1

---
 .../python-modules/kombu/default.nix          | 25 +++++++++++++++++
 pkgs/top-level/python-packages.nix            | 28 +------------------
 2 files changed, 26 insertions(+), 27 deletions(-)
 create mode 100644 pkgs/development/python-modules/kombu/default.nix

diff --git a/pkgs/development/python-modules/kombu/default.nix b/pkgs/development/python-modules/kombu/default.nix
new file mode 100644
index 000000000000..7620ee944417
--- /dev/null
+++ b/pkgs/development/python-modules/kombu/default.nix
@@ -0,0 +1,25 @@
+{ lib, buildPythonPackage, fetchPypi, pytest, case, pytz, amqp }:
+
+buildPythonPackage rec {
+    pname = "kombu";
+    version = "4.2.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "86adec6c60f63124e2082ea8481bbe4ebe04fde8ebed32c177c7f0cd2c1c9082";
+  };
+
+  postPatch = ''
+    substituteInPlace requirements/test.txt --replace "pytest-sugar" ""
+  '';
+
+  checkInputs = [ pytest case pytz ];
+
+  propagatedBuildInputs = [ amqp ];
+
+  meta = with lib; {
+    description = "Messaging library for Python";
+    homepage    = https://github.com/celery/kombu;
+    license     = licenses.bsd3;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b2b1b295896d..ec5f7714992c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6934,33 +6934,7 @@ in {
 
   koji = callPackage ../development/python-modules/koji { };
 
-  kombu = buildPythonPackage rec {
-    name = "kombu-${version}";
-    version = "4.0.2";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/k/kombu/${name}.tar.gz";
-      sha256 = "18hiricdnbnlz6hx3hbaa4dni6npv8rbid4dhf7k02k16qm6zz6h";
-    };
-
-    # Backport fix for python-3.6 from master (see issue https://github.com/celery/kombu/issues/675)
-    # TODO remove at next update
-    patches = [ (pkgs.fetchpatch {
-      url = "https://github.com/celery/kombu/commit/dc3fceff59d79ceac3f8f11a5d697beabb4b7a7f.patch";
-      sha256 = "0s6gsihzjvmpffc7xrrcijw00r56yb74jg0sbjgng2v1324z1da9";
-      name = "don-t-modify-dict-size-while-iterating-over-it";
-    }) ];
-
-    buildInputs = with self; [ pytest case pytz ];
-
-    propagatedBuildInputs = with self; [ amqp ];
-
-    meta = {
-      description = "Messaging library for Python";
-      homepage    = "https://github.com/celery/kombu";
-      license     = licenses.bsd3;
-    };
-  };
+  kombu = callPackage ../development/python-modules/kombu { };
 
   konfig = callPackage ../development/python-modules/konfig { };