From e063c490b42b96604e84375593af50fd81cf67ca Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sat, 27 Oct 2018 09:16:17 -0400 Subject: [PATCH] pythonPackages.tilestache: refactor move to python-modules --- .../python-modules/tilestache/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 21 +------------ 2 files changed, 32 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/python-modules/tilestache/default.nix diff --git a/pkgs/development/python-modules/tilestache/default.nix b/pkgs/development/python-modules/tilestache/default.nix new file mode 100644 index 00000000000..0b919cb9c6d --- /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 b11cbfd59c8..cb9142bb3c0 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";