about summary refs log tree commit diff
diff options
context:
space:
mode:
authorChris Ostrouchov <chris.ostrouchov@gmail.com>2018-10-27 09:16:17 -0400
committerChris Ostrouchov <chris.ostrouchov@gmail.com>2018-10-30 00:50:43 -0400
commite063c490b42b96604e84375593af50fd81cf67ca (patch)
tree236fd3f08c598e924b1bfdc64077f6ae789f6308
parentf1c3b4fc934bcd7e10914fc523b9c507a98d8f2a (diff)
downloadnixlib-e063c490b42b96604e84375593af50fd81cf67ca.tar
nixlib-e063c490b42b96604e84375593af50fd81cf67ca.tar.gz
nixlib-e063c490b42b96604e84375593af50fd81cf67ca.tar.bz2
nixlib-e063c490b42b96604e84375593af50fd81cf67ca.tar.lz
nixlib-e063c490b42b96604e84375593af50fd81cf67ca.tar.xz
nixlib-e063c490b42b96604e84375593af50fd81cf67ca.tar.zst
nixlib-e063c490b42b96604e84375593af50fd81cf67ca.zip
pythonPackages.tilestache: refactor move to python-modules
-rw-r--r--pkgs/development/python-modules/tilestache/default.nix31
-rw-r--r--pkgs/top-level/python-packages.nix21
2 files changed, 32 insertions, 20 deletions
diff --git a/pkgs/development/python-modules/tilestache/default.nix b/pkgs/development/python-modules/tilestache/default.nix
new file mode 100644
index 000000000000..0b919cb9c6d3
--- /dev/null
+++ b/pkgs/development/python-modules/tilestache/default.nix
@@ -0,0 +1,31 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, modestmaps
+, pillow
+, pycairo
+, python-mapnik
+, simplejson
+, werkzeug
+, isPy27
+}:
+
+buildPythonPackage rec {
+  pname = "tilestache";
+  version = "1.50.1";
+  disabled = !isPy27;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1z1j35pz77lhhjdn69sq5rmz62b5m444507d8zjnp0in5xqaj6rj";
+  };
+
+  propagatedBuildInputs = [ modestmaps pillow pycairo python-mapnik simplejson werkzeug ];
+
+  meta = with stdenv.lib; {
+    description = "A tile server for rendered geographic data";
+    homepage = http://tilestache.org;
+    license = licenses.bsd3;
+  };
+
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b11cbfd59c82..cb9142bb3c01 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3784,26 +3784,7 @@ in {
 
   tidylib = callPackage ../development/python-modules/pytidylib { };
 
-  tilestache = self.buildPythonPackage rec {
-    name = "tilestache-${version}";
-    version = "1.50.1";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/T/TileStache/TileStache-${version}.tar.gz";
-      sha256 = "1z1j35pz77lhhjdn69sq5rmz62b5m444507d8zjnp0in5xqaj6rj";
-    };
-
-    disabled = !isPy27;
-
-    propagatedBuildInputs = with self;
-      [ modestmaps pillow pycairo python-mapnik simplejson werkzeug ];
-
-    meta = {
-      description = "A tile server for rendered geographic data";
-      homepage = http://tilestache.org;
-      license = licenses.bsd3;
-    };
-  };
+  tilestache = callPackage ../development/python-modules/tilestache { };
 
   timelib = buildPythonPackage rec {
     name = "timelib-0.2.4";