From 990da90083d2fb911143a4af5f682b4fe48c4839 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Wed, 10 Oct 2018 12:23:25 -0400
Subject: [PATCH] pythonPackages.azure: refactor move to python-modules

---
 .../python-modules/azure/default.nix          | 39 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 21 +---------
 2 files changed, 41 insertions(+), 19 deletions(-)
 create mode 100644 pkgs/development/python-modules/azure/default.nix

diff --git a/pkgs/development/python-modules/azure/default.nix b/pkgs/development/python-modules/azure/default.nix
new file mode 100644
index 000000000000..c021e483d943
--- /dev/null
+++ b/pkgs/development/python-modules/azure/default.nix
@@ -0,0 +1,39 @@
+{ pkgs
+, buildPythonPackage
+, fetchPypi
+, dateutil
+, futures
+, pyopenssl
+, requests
+, pythonOlder
+, isPy3k
+}:
+
+buildPythonPackage rec {
+  version = "0.11.0";
+  pname = "azure";
+
+  src = fetchPypi {
+    inherit pname version;
+    extension = "zip";
+    sha256 = "89c20b2efaaed3c6f56345d55c32a8d4e7d2a16c032d0acb92f8f490c508fe24";
+  };
+
+  propagatedBuildInputs = [ dateutil pyopenssl requests ]
+                            ++ pkgs.lib.optionals (!isPy3k) [ futures ];
+
+  # depends on futures for python 3 (not necissary)
+  patchPhase = if (!isPy3k) then "" else ''
+    sed -i -e "s/'futures'//" setup.py
+  '';
+
+  # tests are not packaged in pypi release
+  doCheck = false;
+
+  meta = with pkgs.lib; {
+    description = "Microsoft Azure SDK for Python";
+    homepage = "https://azure.microsoft.com/en-us/develop/python/";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ olcai ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 72b5e0b97b03..1ae2dfc76302 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -216,6 +216,8 @@ in {
 
   ansiconv = callPackage ../development/python-modules/ansiconv { };
 
+  azure = callPackage ../development/python-modules/azure { };
+
   backports_csv = callPackage ../development/python-modules/backports_csv {};
 
   backports-shutil-which = callPackage ../development/python-modules/backports-shutil-which {};
@@ -767,25 +769,6 @@ in {
 
   noise = callPackage ../development/python-modules/noise {};
 
-  azure = buildPythonPackage rec {
-    version = "0.11.0";
-    name = "azure-${version}";
-    disabled = pythonOlder "2.7";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/a/azure/${name}.zip";
-      sha256 = "89c20b2efaaed3c6f56345d55c32a8d4e7d2a16c032d0acb92f8f490c508fe24";
-    };
-
-    propagatedBuildInputs = with self; [ dateutil futures pyopenssl requests ];
-
-    meta = {
-      description = "Microsoft Azure SDK for Python";
-      homepage = "https://azure.microsoft.com/en-us/develop/python/";
-      license = licenses.asl20;
-      maintainers = with maintainers; [ olcai ];
-    };
-  };
 
   azure-nspkg = buildPythonPackage rec {
     version = "1.0.0";