about summary refs log tree commit diff
diff options
context:
space:
mode:
authorChris Ostrouchov <chris.ostrouchov@gmail.com>2018-10-15 16:17:00 -0400
committerFrederik Rietdijk <fridh@fridh.nl>2018-10-17 07:46:56 +0200
commit82d27cd4f48103100b01b4ad153d922f76c35457 (patch)
treebddab30ae43821f6800e730d03fe3d795ef31682
parent1504902b9406aa61d04886f3746370a7538f3129 (diff)
downloadnixlib-82d27cd4f48103100b01b4ad153d922f76c35457.tar
nixlib-82d27cd4f48103100b01b4ad153d922f76c35457.tar.gz
nixlib-82d27cd4f48103100b01b4ad153d922f76c35457.tar.bz2
nixlib-82d27cd4f48103100b01b4ad153d922f76c35457.tar.lz
nixlib-82d27cd4f48103100b01b4ad153d922f76c35457.tar.xz
nixlib-82d27cd4f48103100b01b4ad153d922f76c35457.tar.zst
nixlib-82d27cd4f48103100b01b4ad153d922f76c35457.zip
pythonPackages.ipaddress: refactor move to python-modules
-rw-r--r--pkgs/development/python-modules/ipaddress/default.nix27
-rw-r--r--pkgs/top-level/python-packages.nix19
2 files changed, 28 insertions, 18 deletions
diff --git a/pkgs/development/python-modules/ipaddress/default.nix b/pkgs/development/python-modules/ipaddress/default.nix
new file mode 100644
index 000000000000..5052c3dc2f4e
--- /dev/null
+++ b/pkgs/development/python-modules/ipaddress/default.nix
@@ -0,0 +1,27 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, pythonAtLeast
+, python
+}:
+
+if (pythonAtLeast "3.3") then null else buildPythonPackage rec {
+  pname = "ipaddress";
+  version = "1.0.18";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1q8klj9d84cmxgz66073x1j35cplr3r77vx1znhxiwl5w74391ax";
+  };
+
+  checkPhase = ''
+    ${python.interpreter} test_ipaddress.py
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Port of the 3.3+ ipaddress module to 2.6, 2.7, and 3.2";
+    homepage = https://github.com/phihag/ipaddress;
+    license = licenses.psfl;
+  };
+
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4b5373ed87ee..39513bc8ee7f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5589,24 +5589,7 @@ in {
 
   ipaddr = callPackage ../development/python-modules/ipaddr { };
 
-  ipaddress = if (pythonAtLeast "3.3") then null else buildPythonPackage rec {
-    name = "ipaddress-1.0.18";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/i/ipaddress/${name}.tar.gz";
-      sha256 = "1q8klj9d84cmxgz66073x1j35cplr3r77vx1znhxiwl5w74391ax";
-    };
-
-    checkPhase = ''
-      ${python.interpreter} test_ipaddress.py
-    '';
-
-    meta = {
-      description = "Port of the 3.3+ ipaddress module to 2.6, 2.7, and 3.2";
-      homepage = https://github.com/phihag/ipaddress;
-      license = licenses.psfl;
-    };
-  };
+  ipaddress = callPackage ../development/python-modules/ipaddress { };
 
   ipdb = buildPythonPackage rec {
     name = "ipdb-${version}";