commit 3391455ee20e96cd3ac3a070c1412809d16c7129 parent 061c7bb2b7c994b11f0620817b153a921b7391dd Author: Nikolay Korotkiy <sikmir@gmail.com> Date: Tue, 26 Jan 2021 12:59:00 +0300 Move nakarte deps to separate directory Diffstat:
12 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/pkgs/default.nix b/pkgs/default.nix @@ -125,16 +125,12 @@ lib.makeScope newScope ( click-6-7 = callPackage ./development/python-modules/click { }; gpxelevations = callPackage ./development/python-modules/gpxelevations { }; jsonseq = callPackage ./development/python-modules/jsonseq { }; - maprec = callPackage ./development/python-modules/maprec { }; mercantile = callPackage ./development/python-modules/mercantile { }; mikatools = callPackage ./development/python-modules/mikatools { }; - ozi_map = callPackage ./development/python-modules/ozi_map { }; pyephem = callPackage ./development/python-modules/pyephem { }; - pyimagequant = callPackage ./development/python-modules/pyimagequant { }; pymbtiles = callPackage ./development/python-modules/pymbtiles { }; python-hfst = callPackage ./development/python-modules/python-hfst { }; s2sphere = callPackage ./development/python-modules/s2sphere { }; - thinplatespline = callPackage ./development/python-modules/thinplatespline { }; ### TOOLS @@ -154,7 +150,6 @@ lib.makeScope newScope ( gpxtools = callPackage ./tools/geo/gpxtools { }; gpxtrackposter = callPackage ./tools/geo/gpxtrackposter { }; lazyscraper = callPackage ./tools/text/lazyscraper { }; - map-tiler = callPackage ./tools/geo/map-tiler { }; py-staticmaps = callPackage ./tools/geo/py-staticmaps { }; supermercado = callPackage ./tools/geo/supermercado { }; tilesets-cli = callPackage ./tools/geo/tilesets-cli { }; @@ -249,6 +244,16 @@ lib.makeScope newScope ( taskcoach = callPackage ./misc/taskcoach { }; xfractint = callPackage ./misc/xfractint { }; + ### NAKARTE + + elevation_server = callPackage ./nakarte/elevation_server { }; + map-tiler = callPackage ./nakarte/map-tiler { }; + maprec = callPackage ./nakarte/maprec { }; + nakarte = callPackage ./nakarte/nakarte { }; + ozi_map = callPackage ./nakarte/ozi_map { }; + pyimagequant = callPackage ./nakarte/pyimagequant { }; + thinplatespline = callPackage ./nakarte/thinplatespline { }; + ### OSM map-stylizer = callPackage ./osm/map-stylizer { }; @@ -261,9 +266,7 @@ lib.makeScope newScope ( ### SERVERS - elevation_server = callPackage ./servers/elevation_server { }; glauth = callPackage ./servers/glauth { }; - nakarte = callPackage ./servers/nakarte { }; ### SUCKLESS diff --git a/pkgs/servers/elevation_server/default.nix b/pkgs/nakarte/elevation_server/default.nix diff --git a/pkgs/servers/elevation_server/deps.nix b/pkgs/nakarte/elevation_server/deps.nix diff --git a/pkgs/tools/geo/map-tiler/default.nix b/pkgs/nakarte/map-tiler/default.nix diff --git a/pkgs/tools/geo/map-tiler/gobject.patch b/pkgs/nakarte/map-tiler/gobject.patch diff --git a/pkgs/tools/geo/map-tiler/python3.patch b/pkgs/nakarte/map-tiler/python3.patch diff --git a/pkgs/development/python-modules/maprec/default.nix b/pkgs/nakarte/maprec/default.nix diff --git a/pkgs/development/python-modules/maprec/python3.patch b/pkgs/nakarte/maprec/python3.patch diff --git a/pkgs/servers/nakarte/default.nix b/pkgs/nakarte/nakarte/default.nix diff --git a/pkgs/development/python-modules/ozi_map/default.nix b/pkgs/nakarte/ozi_map/default.nix diff --git a/pkgs/development/python-modules/pyimagequant/default.nix b/pkgs/nakarte/pyimagequant/default.nix diff --git a/pkgs/development/python-modules/thinplatespline/default.nix b/pkgs/nakarte/thinplatespline/default.nix