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

---
 .../python-modules/ipaddr/default.nix         | 23 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 17 +-------------
 2 files changed, 24 insertions(+), 16 deletions(-)
 create mode 100644 pkgs/development/python-modules/ipaddr/default.nix

diff --git a/pkgs/development/python-modules/ipaddr/default.nix b/pkgs/development/python-modules/ipaddr/default.nix
new file mode 100644
index 00000000000..4325e6ea884
--- /dev/null
+++ b/pkgs/development/python-modules/ipaddr/default.nix
@@ -0,0 +1,23 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, isPy3k
+}:
+
+buildPythonPackage rec {
+  pname = "ipaddr";
+  version = "2.1.11";
+  disabled = isPy3k;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1dwq3ngsapjc93fw61rp17fvzggmab5x1drjzvd4y4q0i255nm8v";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Google's IP address manipulation library";
+    homepage = http://code.google.com/p/ipaddr-py/;
+    license = licenses.asl20;
+  };
+
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4828b667911..8eab8cd96ec 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5618,22 +5618,7 @@ in {
 
   ipywidgets = callPackage ../development/python-modules/ipywidgets { };
 
-  ipaddr = buildPythonPackage rec {
-    name = "ipaddr-${version}";
-    version = "2.1.11";
-    disabled = isPy3k;
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/i/ipaddr/${name}.tar.gz";
-      sha256 = "1dwq3ngsapjc93fw61rp17fvzggmab5x1drjzvd4y4q0i255nm8v";
-    };
-
-    meta = {
-      description = "Google's IP address manipulation library";
-      homepage = http://code.google.com/p/ipaddr-py/;
-      license = licenses.asl20;
-    };
-  };
+  ipaddr = callPackage ../development/python-modules/ipaddr { };
 
   ipaddress = if (pythonAtLeast "3.3") then null else buildPythonPackage rec {
     name = "ipaddress-1.0.18";