From 781d05c95aa73f0b1ec650fdb9ca6ed7dcf8de20 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Fri, 26 Oct 2018 09:10:10 -0400
Subject: [PATCH] pythonPackages.pycurl2: refactor move to python-modules

---
 .../python-modules/pycurl2/default.nix        | 34 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 22 +-----------
 2 files changed, 35 insertions(+), 21 deletions(-)
 create mode 100644 pkgs/development/python-modules/pycurl2/default.nix

diff --git a/pkgs/development/python-modules/pycurl2/default.nix b/pkgs/development/python-modules/pycurl2/default.nix
new file mode 100644
index 00000000000..9b04f2b6fcb
--- /dev/null
+++ b/pkgs/development/python-modules/pycurl2/default.nix
@@ -0,0 +1,34 @@
+{ stdenv
+, buildPythonPackage
+, fetchgit
+, isPy3k
+, simplejson
+, unittest2
+, nose
+, pkgs
+}:
+
+buildPythonPackage rec {
+  pname = "pycurl2";
+  version = "7.20.0";
+  disabled = isPy3k;
+
+  src = fetchgit {
+    url = "https://github.com/Lispython/pycurl.git";
+    rev = "0f00109950b883d680bd85dc6e8a9c731a7d0d13";
+    sha256 = "1qmw3cm93kxj94s71a8db9lwv2cxmr2wjv7kp1r8zildwdzhaw7j";
+  };
+
+  # error: (6, "Couldn't resolve host 'h.wrttn.me'")
+  doCheck = false;
+
+  buildInputs = [ pkgs.curl simplejson unittest2 nose ];
+
+  meta = with stdenv.lib; {
+    homepage = https://pypi.python.org/pypi/pycurl2;
+    description = "A fork from original PycURL library that no maintained from 7.19.0";
+    license = licenses.mit;
+    platforms = platforms.linux;
+  };
+
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0ea08132bf9..a2c04b3929b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3293,27 +3293,7 @@ in {
 
   pycurl = callPackage ../development/python-modules/pycurl { };
 
-  pycurl2 = buildPythonPackage (rec {
-    name = "pycurl2-7.20.0";
-    disabled = isPy3k;
-
-    src = pkgs.fetchgit {
-      url = "https://github.com/Lispython/pycurl.git";
-      rev = "0f00109950b883d680bd85dc6e8a9c731a7d0d13";
-      sha256 = "1qmw3cm93kxj94s71a8db9lwv2cxmr2wjv7kp1r8zildwdzhaw7j";
-    };
-
-    # error: (6, "Couldn't resolve host 'h.wrttn.me'")
-    doCheck = false;
-
-    buildInputs = with self; [ pkgs.curl simplejson unittest2 nose ];
-
-    meta = {
-      homepage = https://pypi.python.org/pypi/pycurl2;
-      description = "A fork from original PycURL library that no maintained from 7.19.0";
-      platforms = platforms.linux;
-    };
-  });
+  pycurl2 = callPackage ../development/python-modules/pycurl2 { };
 
   pydispatcher = buildPythonPackage (rec {
     version = "2.0.5";