From 82d27cd4f48103100b01b4ad153d922f76c35457 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Mon, 15 Oct 2018 16:17:00 -0400
Subject: [PATCH] pythonPackages.ipaddress: refactor move to python-modules
---
.../python-modules/ipaddress/default.nix | 27 +++++++++++++++++++
pkgs/top-level/python-packages.nix | 19 +------------
2 files changed, 28 insertions(+), 18 deletions(-)
create mode 100644 pkgs/development/python-modules/ipaddress/default.nix
diff --git a/pkgs/development/python-modules/ipaddress/default.nix b/pkgs/development/python-modules/ipaddress/default.nix
new file mode 100644
index 00000000000..5052c3dc2f4
--- /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 4b5373ed87e..39513bc8ee7 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}";