From 13f85532e7fe4c359a3fbf497738a1e9c50c7757 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Thu, 25 Oct 2018 20:58:15 -0400
Subject: [PATCH] pythonPackages.paste: refactor move to python-modules

---
 .../python-modules/paste/default.nix          | 31 +++++++++++++++++++
 .../python-modules/patch/default.nix          |  8 ++---
 pkgs/top-level/python-packages.nix            | 24 +-------------
 3 files changed, 36 insertions(+), 27 deletions(-)
 create mode 100644 pkgs/development/python-modules/paste/default.nix

diff --git a/pkgs/development/python-modules/paste/default.nix b/pkgs/development/python-modules/paste/default.nix
new file mode 100644
index 00000000000..e8aceae062f
--- /dev/null
+++ b/pkgs/development/python-modules/paste/default.nix
@@ -0,0 +1,31 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, nose
+, six
+}:
+
+buildPythonPackage rec {
+  pname = "paste";
+  version = "2.0.3";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "062jk0nlxf6lb2wwj6zc20rlvrwsnikpkh90y0dn8cjch93s6ii3";
+  };
+
+  checkInputs = [ nose ];
+  propagatedBuildInputs = [ six ];
+
+  # Certain tests require network
+  checkPhase = ''
+    NOSE_EXCLUDE=test_ok,test_form,test_error,test_stderr,test_paste_website nosetests
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Tools for using a Web Server Gateway Interface stack";
+    homepage = http://pythonpaste.org/;
+    license = licenses.mit;
+  };
+
+}
diff --git a/pkgs/development/python-modules/patch/default.nix b/pkgs/development/python-modules/patch/default.nix
index fbd62500371..1a7ce953947 100644
--- a/pkgs/development/python-modules/patch/default.nix
+++ b/pkgs/development/python-modules/patch/default.nix
@@ -1,16 +1,16 @@
 { stdenv
 , buildPythonPackage
-, fetchPypi
+, fetchzip
 }:
 
 buildPythonPackage rec {
   version = "1.16";
   pname = "patch";
 
-  src = fetchPypi {
-    inherit pname version;
-    extension = "zip";
+  src = fetchzip {
+    url = "mirror://pypi/p/${pname}/${pname}-${version}.zip";
     sha256 = "1nj55hvyvzax4lxq7vkyfbw91pianzr3hp7ka7j12pgjxccac50g";
+    stripRoot = false;
   };
 
   # No tests included in archive
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f5f783cc468..4b55612bdc0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3101,29 +3101,7 @@ in {
 
   patsy = callPackage ../development/python-modules/patsy { };
 
-  paste = buildPythonPackage rec {
-    name = "paste-${version}";
-    version = "2.0.3";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/P/Paste/Paste-${version}.tar.gz";
-      sha256 = "062jk0nlxf6lb2wwj6zc20rlvrwsnikpkh90y0dn8cjch93s6ii3";
-    };
-
-    checkInputs = with self; [ nose ];
-    propagatedBuildInputs = with self; [ six ];
-
-    # Certain tests require network
-    checkPhase = ''
-      NOSE_EXCLUDE=test_ok,test_form,test_error,test_stderr,test_paste_website nosetests
-    '';
-
-    meta = {
-      description = "Tools for using a Web Server Gateway Interface stack";
-      homepage = http://pythonpaste.org/;
-    };
-  };
-
+  paste = callPackage ../development/python-modules/paste { };
 
   PasteDeploy = buildPythonPackage rec {
     version = "1.5.2";