From dadd7546563db6e311f1116c4ae7d135bc2304ad Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Tue, 16 Oct 2018 17:15:06 -0400
Subject: [PATCH] pythonPackages.httpretty: refactor move to python-modules

---
 .../python-modules/httpretty/default.nix      | 50 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 37 +-------------
 2 files changed, 51 insertions(+), 36 deletions(-)
 create mode 100644 pkgs/development/python-modules/httpretty/default.nix

diff --git a/pkgs/development/python-modules/httpretty/default.nix b/pkgs/development/python-modules/httpretty/default.nix
new file mode 100644
index 00000000000..1f135255bc0
--- /dev/null
+++ b/pkgs/development/python-modules/httpretty/default.nix
@@ -0,0 +1,50 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, tornado
+, requests
+, httplib2
+, sure
+, nose
+, coverage
+, certifi
+, urllib3
+, isPy3k
+}:
+
+buildPythonPackage rec {
+  pname = "httpretty";
+  version = "0.8.10";
+  doCheck = false;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1nmdk6d89z14x3wg4yxywlxjdip16zc8bqnfb471z1365mr74jj7";
+  };
+
+  buildInputs = [ tornado requests httplib2 sure nose coverage certifi ];
+  propagatedBuildInputs = [ urllib3 ];
+
+  postPatch = ''
+    sed -i -e 's/==.*$//' *requirements.txt
+    # XXX: Drop this after version 0.8.4 is released.
+    patch httpretty/core.py <<DIFF
+    ***************
+    *** 566 ****
+    !                 'content-length': len(self.body)
+    --- 566 ----
+    !                 'content-length': str(len(self.body))
+    DIFF
+
+    # Explicit encoding flag is required with python3, unless locale is set.
+    ${if !isPy3k then "" else
+      "patch -p0 -i ${./setup.py.patch}"}
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "https://falcao.it/HTTPretty/";
+    description = "HTTP client request mocking tool";
+    license = licenses.mit;
+  };
+
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bec6757f0e6..070512a8e7d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2472,42 +2472,7 @@ in {
 
   hkdf = callPackage ../development/python-modules/hkdf { };
 
-  httpretty = buildPythonPackage rec {
-    name = "httpretty-${version}";
-    version = "0.8.10";
-    doCheck = false;
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/h/httpretty/${name}.tar.gz";
-      sha256 = "1nmdk6d89z14x3wg4yxywlxjdip16zc8bqnfb471z1365mr74jj7";
-    };
-
-    buildInputs = with self; [ tornado requests httplib2 sure nose coverage certifi ];
-
-    propagatedBuildInputs = with self; [ urllib3 ];
-
-    postPatch = ''
-      sed -i -e 's/==.*$//' *requirements.txt
-      # XXX: Drop this after version 0.8.4 is released.
-      patch httpretty/core.py <<DIFF
-      ***************
-      *** 566 ****
-      !                 'content-length': len(self.body)
-      --- 566 ----
-      !                 'content-length': str(len(self.body))
-      DIFF
-
-      # Explicit encoding flag is required with python3, unless locale is set.
-      ${if !self.isPy3k then "" else
-        "patch -p0 -i ${../development/python-modules/httpretty/setup.py.patch}"}
-    '';
-
-    meta = {
-      homepage = "https://falcao.it/HTTPretty/";
-      description = "HTTP client request mocking tool";
-      license = licenses.mit;
-    };
-  };
+  httpretty = callPackage ../development/python-modules/httpretty { };
 
   icalendar = buildPythonPackage rec {
     version = "3.9.0";