From ded3676b18b19f83d72ccbcd2433254b9506f983 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Tue, 16 Oct 2018 18:18:37 -0400
Subject: [PATCH] pythonPackages.modestmaps: refactor move to python-modules

---
 .../python-modules/modestmaps/default.nix     | 26 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 18 +------------
 2 files changed, 27 insertions(+), 17 deletions(-)
 create mode 100644 pkgs/development/python-modules/modestmaps/default.nix

diff --git a/pkgs/development/python-modules/modestmaps/default.nix b/pkgs/development/python-modules/modestmaps/default.nix
new file mode 100644
index 000000000000..f0918e4bdb6f
--- /dev/null
+++ b/pkgs/development/python-modules/modestmaps/default.nix
@@ -0,0 +1,26 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, pillow
+, isPy27
+}:
+
+buildPythonPackage rec {
+  pname = "ModestMaps";
+  version = "1.4.6";
+  disabled = !isPy27;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0vyi1m9q4pc34i6rq5agb4x3qicx5sjlbxwmxfk70k2l5mnbjca3";
+  };
+
+  propagatedBuildInputs = [ pillow ];
+
+  meta = with stdenv.lib; {
+    description = "A library for building interactive maps";
+    homepage = http://modestmaps.com;
+    license = stdenv.lib.licenses.bsd3;
+  };
+
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7a35a2cb1bcc..5d62487c68b0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2809,23 +2809,7 @@ in {
 
   mock-open = callPackage ../development/python-modules/mock-open { };
 
-  modestmaps = buildPythonPackage rec {
-    name = "ModestMaps-1.4.6";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/M/ModestMaps/${name}.tar.gz";
-      sha256 = "0vyi1m9q4pc34i6rq5agb4x3qicx5sjlbxwmxfk70k2l5mnbjca3";
-    };
-
-    disabled = !isPy27;
-    propagatedBuildInputs = with self; [ pillow ];
-
-    meta = {
-      description = "A library for building interactive maps";
-      homepage = http://modestmaps.com;
-      license = stdenv.lib.licenses.bsd3;
-    };
-  };
+  modestmaps = callPackage ../development/python-modules/modestmaps { };
 
   # Needed here because moinmoin is loaded as a Python library.
   moinmoin = callPackage ../development/python-modules/moinmoin { };