commit 116c9c8da86abec71b046efd2cc6ba8ee76cca49 parent a7354019d549e1834c2f861dd3a8fe0afa51f611 Author: Nikolay Korotkiy <sikmir@gmail.com> Date: Thu, 23 Sep 2021 00:58:39 +0300 Move gis and geo tools to geospatial Diffstat:
24 files changed, 21 insertions(+), 24 deletions(-)
diff --git a/pkgs/default.nix b/pkgs/default.nix @@ -106,23 +106,6 @@ lib.makeScope newScope ( wikitextprocessor = callPackage ./development/python-modules/wikitextprocessor { }; wiktfinnish = callPackage ./development/python-modules/wiktfinnish { }; - ### TOOLS - - datamaps = callPackage ./tools/geo/datamaps { }; - elevation = callPackage ./tools/geo/elevation { - click = click-6-7; - }; - go-staticmaps = callPackage ./tools/geo/go-staticmaps { }; - mbtiles2osmand = callPackage ./tools/geo/mbtiles2osmand { }; - py-staticmaps = callPackage ./tools/geo/py-staticmaps { }; - render_geojson = callPackage ./tools/geo/render_geojson { }; - rio-mbtiles = callPackage ./tools/geo/rio-mbtiles { }; - supermercado = callPackage ./tools/geo/supermercado { }; - tile-stitch = callPackage ./tools/geo/tile-stitch { }; - tilesets-cli = callPackage ./tools/geo/tilesets-cli { }; - tpkutils = callPackage ./tools/geo/tpkutils { }; - vt2geojson = callPackage ./tools/geo/vt2geojson { }; - ### DICT dict2rest = callPackage ./dict/dict2rest { }; @@ -196,15 +179,29 @@ lib.makeScope newScope ( inherit (darwin.apple_sdk.frameworks) Security; }; - ### GIS + ### GEOSPATIAL - mapsoft = callPackage ./gis/mapsoft { }; - mapsoft2 = callPackage ./gis/mapsoft/2.nix { }; - qgis-bin = callPackage ./gis/qgis/bin.nix { }; + datamaps = callPackage ./geospatial/datamaps { }; + elevation = callPackage ./geospatial/elevation { + click = click-6-7; + }; + go-staticmaps = callPackage ./geospatial/go-staticmaps { }; + mapsoft = callPackage ./geospatial/mapsoft { }; + mapsoft2 = callPackage ./geospatial/mapsoft/2.nix { }; + mbtiles2osmand = callPackage ./geospatial/mbtiles2osmand { }; + py-staticmaps = callPackage ./geospatial/py-staticmaps { }; + qgis-bin = callPackage ./geospatial/qgis/bin.nix { }; qgis-ltr-bin = qgis-bin.override { releaseType = "ltr"; }; - qmapshack-bin = callPackage ./gis/qmapshack/bin.nix { }; - sasplanet-bin = callPackage ./gis/sasplanet/bin.nix { }; - tdh = callPackage ./gis/tdh { }; + qmapshack-bin = callPackage ./geospatial/qmapshack/bin.nix { }; + render_geojson = callPackage ./geospatial/render_geojson { }; + rio-mbtiles = callPackage ./geospatial/rio-mbtiles { }; + sasplanet-bin = callPackage ./geospatial/sasplanet/bin.nix { }; + supermercado = callPackage ./geospatial/supermercado { }; + tdh = callPackage ./geospatial/tdh { }; + tile-stitch = callPackage ./geospatial/tile-stitch { }; + tilesets-cli = callPackage ./geospatial/tilesets-cli { }; + tpkutils = callPackage ./geospatial/tpkutils { }; + vt2geojson = callPackage ./geospatial/vt2geojson { }; ### GNSS diff --git a/pkgs/tools/geo/datamaps/default.nix b/pkgs/geospatial/datamaps/default.nix diff --git a/pkgs/tools/geo/elevation/default.nix b/pkgs/geospatial/elevation/default.nix diff --git a/pkgs/tools/geo/go-staticmaps/default.nix b/pkgs/geospatial/go-staticmaps/default.nix diff --git a/pkgs/tools/geo/go-staticmaps/extra-tileproviders.patch b/pkgs/geospatial/go-staticmaps/extra-tileproviders.patch diff --git a/pkgs/gis/mapsoft/0001-fix-build.patch b/pkgs/geospatial/mapsoft/0001-fix-build.patch diff --git a/pkgs/gis/mapsoft/0002-fix-build.patch b/pkgs/geospatial/mapsoft/0002-fix-build.patch diff --git a/pkgs/gis/mapsoft/2.nix b/pkgs/geospatial/mapsoft/2.nix diff --git a/pkgs/gis/mapsoft/default.nix b/pkgs/geospatial/mapsoft/default.nix diff --git a/pkgs/tools/geo/mbtiles2osmand/default.nix b/pkgs/geospatial/mbtiles2osmand/default.nix diff --git a/pkgs/tools/geo/py-staticmaps/default.nix b/pkgs/geospatial/py-staticmaps/default.nix diff --git a/pkgs/gis/qgis/bin.nix b/pkgs/geospatial/qgis/bin.nix diff --git a/pkgs/gis/qmapshack/bin.nix b/pkgs/geospatial/qmapshack/bin.nix diff --git a/pkgs/tools/geo/render_geojson/default.nix b/pkgs/geospatial/render_geojson/default.nix diff --git a/pkgs/tools/geo/rio-mbtiles/default.nix b/pkgs/geospatial/rio-mbtiles/default.nix diff --git a/pkgs/gis/sasplanet/bin.nix b/pkgs/geospatial/sasplanet/bin.nix diff --git a/pkgs/tools/geo/supermercado/default.nix b/pkgs/geospatial/supermercado/default.nix diff --git a/pkgs/gis/tdh/base.nix b/pkgs/geospatial/tdh/base.nix diff --git a/pkgs/gis/tdh/default.nix b/pkgs/geospatial/tdh/default.nix diff --git a/pkgs/tools/geo/tile-stitch/default.nix b/pkgs/geospatial/tile-stitch/default.nix diff --git a/pkgs/tools/geo/tilesets-cli/default.nix b/pkgs/geospatial/tilesets-cli/default.nix diff --git a/pkgs/tools/geo/tpkutils/default.nix b/pkgs/geospatial/tpkutils/default.nix diff --git a/pkgs/tools/geo/vt2geojson/default.nix b/pkgs/geospatial/vt2geojson/default.nix diff --git a/pkgs/gnss/visualgp/default.nix b/pkgs/gnss/visualgps/default.nix