about summary refs log tree commit diff
diff options
context:
space:
mode:
authorChris Ostrouchov <chris.ostrouchov@gmail.com>2018-10-15 16:12:25 -0400
committerFrederik Rietdijk <fridh@fridh.nl>2018-10-17 07:46:56 +0200
commitb0e0dd399b92cd1a1e578b5b638a1dec8910cd63 (patch)
tree3e95452625a62f00e1f8fd8666043d69293e572e
parent076857913fa207c5842d00b3a531171fa16067c2 (diff)
downloadnixlib-b0e0dd399b92cd1a1e578b5b638a1dec8910cd63.tar
nixlib-b0e0dd399b92cd1a1e578b5b638a1dec8910cd63.tar.gz
nixlib-b0e0dd399b92cd1a1e578b5b638a1dec8910cd63.tar.bz2
nixlib-b0e0dd399b92cd1a1e578b5b638a1dec8910cd63.tar.lz
nixlib-b0e0dd399b92cd1a1e578b5b638a1dec8910cd63.tar.xz
nixlib-b0e0dd399b92cd1a1e578b5b638a1dec8910cd63.tar.zst
nixlib-b0e0dd399b92cd1a1e578b5b638a1dec8910cd63.zip
pythonPackages.ipaddr: refactor move to python-modules
-rw-r--r--pkgs/development/python-modules/ipaddr/default.nix23
-rw-r--r--pkgs/top-level/python-packages.nix17
2 files changed, 24 insertions, 16 deletions
diff --git a/pkgs/development/python-modules/ipaddr/default.nix b/pkgs/development/python-modules/ipaddr/default.nix
new file mode 100644
index 000000000000..4325e6ea8844
--- /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 4828b6679113..8eab8cd96ecf 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";