commit f5dbbd0627e902b8479d27f55bc1daf1bf191b28 parent bc4f9539cea159e6b8c9e533b4045949271e1995 Author: Nikolay Korotkiy <sikmir@gmail.com> Date: Wed, 20 Jan 2021 22:05:28 +0300 Move osm tools to separate directory Diffstat:
7 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/pkgs/default.nix b/pkgs/default.nix @@ -27,7 +27,6 @@ lib.makeScope newScope ( klogg-bin = callPackage ./applications/misc/klogg/bin.nix { }; librewolf = callPackage ./applications/networking/librewolf { }; macpass-bin = callPackage ./applications/macpass/bin.nix { }; - map-stylizer = callPackage ./applications/gis/map-stylizer { }; maperitive-bin = callPackage ./applications/gis/maperitive/bin.nix { }; mapsoft = callPackage ./applications/gis/mapsoft { }; mapsoft2 = callPackage ./applications/gis/mapsoft/2.nix { }; @@ -172,9 +171,6 @@ lib.makeScope newScope ( morse-talk = callPackage ./tools/morse-talk { }; musig = callPackage ./tools/audio/musig { }; odict = callPackage ./tools/dict/odict { }; - osm-area-tools = callPackage ./tools/geo/osm-area-tools { }; - osmcoastline = callPackage ./tools/geo/osmcoastline { }; - phyghtmap = callPackage ./tools/geo/phyghtmap { }; polyvectorization = libsForQt5.callPackage ./tools/graphics/polyvectorization { inherit sources; }; @@ -189,7 +185,6 @@ lib.makeScope newScope ( else callPackage ./tools/dict/stardict-tools { }; supermercado = callPackage ./tools/geo/supermercado { }; supload = callPackage ./tools/misc/supload { }; - taginfo-tools = callPackage ./tools/geo/taginfo-tools { }; tatoebatools = callPackage ./tools/dict/tatoebatools { }; tilesets-cli = callPackage ./tools/geo/tilesets-cli { }; tpkutils = callPackage ./tools/geo/tpkutils { }; @@ -235,7 +230,12 @@ lib.makeScope newScope ( ### OSM + map-stylizer = callPackage ./osm/map-stylizer { }; + osm-area-tools = callPackage ./osm/osm-area-tools { }; + osmcoastline = callPackage ./osm/osmcoastline { }; + phyghtmap = callPackage ./osm/phyghtmap { }; sdlmap = callPackage ./osm/sdlmap { }; + taginfo-tools = callPackage ./osm/taginfo-tools { }; ### SERVERS diff --git a/pkgs/applications/gis/map-stylizer/config.patch b/pkgs/osm/map-stylizer/config.patch diff --git a/pkgs/applications/gis/map-stylizer/default.nix b/pkgs/osm/map-stylizer/default.nix diff --git a/pkgs/tools/geo/osm-area-tools/default.nix b/pkgs/osm/osm-area-tools/default.nix diff --git a/pkgs/tools/geo/osmcoastline/default.nix b/pkgs/osm/osmcoastline/default.nix diff --git a/pkgs/tools/geo/phyghtmap/default.nix b/pkgs/osm/phyghtmap/default.nix diff --git a/pkgs/tools/geo/taginfo-tools/default.nix b/pkgs/osm/taginfo-tools/default.nix