From 4e659884f998d2dd9386a15762d31d1b7bb16214 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Aug 2018 11:51:42 +0200
Subject: [PATCH] pythonPackages.pytest_32: move into celery

as that's the only consumer of this version of Pytest.
---
 pkgs/development/python-modules/celery/default.nix | 13 ++++++++++++-
 pkgs/top-level/python-packages.nix                 | 11 +----------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix
index 71911da08f43..8eef07ac3bb3 100644
--- a/pkgs/development/python-modules/celery/default.nix
+++ b/pkgs/development/python-modules/celery/default.nix
@@ -2,7 +2,18 @@
   pytest, case, kombu, billiard, pytz, anyjson, amqp, eventlet
 }:
 
-buildPythonPackage rec {
+let
+
+  # Needed for celery
+  pytest_32 = pytest.overridePythonAttrs( oldAttrs: rec {
+    version = "3.2.5";
+    src = oldAttrs.src.override {
+      inherit version;
+      sha256 = "6d5bd4f7113b444c55a3bbb5c738a3dd80d43563d063fc42dcb0aaefbdd78b81";
+    };
+  });
+
+in buildPythonPackage rec {
   pname = "celery";
   version = "4.2.0";
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 20d665d7ed68..3b03287b4f3f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1455,7 +1455,7 @@ in {
     '';
   };
 
-  celery = callPackage ../development/python-modules/celery { pytest = self.pytest_32; };
+  celery = callPackage ../development/python-modules/celery { };
 
   cerberus = callPackage ../development/python-modules/cerberus { };
 
@@ -1839,15 +1839,6 @@ in {
     hypothesis = self.hypothesis.override { doCheck = false; };
   };
 
-  # Needed for celery
-  pytest_32 = self.pytest_37.overridePythonAttrs( oldAttrs: rec {
-    version = "3.2.5";
-    src = oldAttrs.src.override {
-      inherit version;
-      sha256 = "6d5bd4f7113b444c55a3bbb5c738a3dd80d43563d063fc42dcb0aaefbdd78b81";
-    };
-  });
-
   pytest-httpbin = callPackage ../development/python-modules/pytest-httpbin { };
 
   pytest-asyncio = callPackage ../development/python-modules/pytest-asyncio { };