From be778594c0688fbb818ed7a34767d3f36c42c74e Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Fri, 26 Oct 2018 12:12:28 -0400
Subject: [PATCH] pythonPackages.geoalchemy2: refactor move to python-modules

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

diff --git a/pkgs/development/python-modules/geoalchemy2/default.nix b/pkgs/development/python-modules/geoalchemy2/default.nix
new file mode 100644
index 00000000000..ca99f73c021
--- /dev/null
+++ b/pkgs/development/python-modules/geoalchemy2/default.nix
@@ -0,0 +1,25 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, sqlalchemy
+, shapely
+}:
+
+buildPythonPackage rec {
+  pname = "GeoAlchemy2";
+  version = "0.3.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0p2h1kgl5b0jz8wadx485vjh1mmm5s67p71yxh9lhp1441hkfswf";
+  };
+
+  propagatedBuildInputs = [ sqlalchemy shapely ];
+
+  meta = with stdenv.lib; {
+    homepage =  http://geoalchemy.org/;
+    license = licenses.mit;
+    description = "Toolkit for working with spatial databases";
+  };
+
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index be4a0fd0041..3e19e4acfd7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3598,23 +3598,7 @@ in {
 
   django-haystack = callPackage ../development/python-modules/django-haystack { };
 
-  geoalchemy2 = buildPythonPackage rec {
-    name = "GeoAlchemy2-${version}";
-    version = "0.3.0";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/G/GeoAlchemy2/${name}.tar.gz";
-      sha256 = "0p2h1kgl5b0jz8wadx485vjh1mmm5s67p71yxh9lhp1441hkfswf";
-    };
-
-    propagatedBuildInputs = with self ; [ sqlalchemy shapely ];
-
-    meta = {
-      homepage =  http://geoalchemy.org/;
-      license = licenses.mit;
-      description = "Toolkit for working with spatial databases";
-    };
-  };
+  geoalchemy2 = callPackage ../development/python-modules/geoalchemy2 { };
 
   geopy = buildPythonPackage rec {
     name = "geopy-${version}";