From 31e46d9d1c39d25b5cac57d0d0d1ba6550676e67 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Fri, 26 Oct 2018 11:45:27 -0400
Subject: [PATCH] pythonPackages.python-etcd: refactor move to python-modules

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

diff --git a/pkgs/development/python-modules/python-etcd/default.nix b/pkgs/development/python-modules/python-etcd/default.nix
new file mode 100644
index 00000000000..d1780fc782b
--- /dev/null
+++ b/pkgs/development/python-modules/python-etcd/default.nix
@@ -0,0 +1,37 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, nose
+, mock
+, pyopenssl
+, urllib3
+, dnspython
+}:
+
+buildPythonPackage rec {
+  pname = "python-etcd";
+  version = "0.4.3";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "cf53262b3890d185fe637eed15fe39c8d7a8261864ddcd7037b22c961456d7fc";
+  };
+
+  buildInputs = [ nose mock pyopenssl ];
+
+  propagatedBuildInputs = [ urllib3 dnspython ];
+
+  postPatch = ''
+    sed -i '19s/dns/"dnspython"/' setup.py
+  '';
+
+  # Some issues with etcd not in path even though most tests passed
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "A python client for Etcd";
+    homepage = https://github.com/jplana/python-etcd;
+    license = licenses.mit;
+  };
+
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4b751801e47..5bd345c71a6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3499,32 +3499,7 @@ in {
 
   python-wifi = callPackage ../development/python-modules/python-wifi { };
 
-  python-etcd = buildPythonPackage rec {
-    name = "python-etcd-${version}";
-    version = "0.4.3";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/python-etcd/${name}.tar.gz";
-      sha256 = "cf53262b3890d185fe637eed15fe39c8d7a8261864ddcd7037b22c961456d7fc";
-    };
-
-    buildInputs = with self; [ nose mock pyopenssl ];
-
-    propagatedBuildInputs = with self; [ urllib3 dnspython ];
-
-    postPatch = ''
-      sed -i '19s/dns/"dnspython"/' setup.py
-    '';
-
-    # Some issues with etcd not in path even though most tests passed
-    doCheck = false;
-
-    meta = {
-      description = "A python client for Etcd";
-      homepage = https://github.com/jplana/python-etcd;
-      license = licenses.mit;
-    };
-  };
+  python-etcd = callPackage ../development/python-modules/python-etcd { };
 
   pythonnet = callPackage ../development/python-modules/pythonnet {
     # `mono >= 4.6` required to prevent crashes encountered with earlier versions.