commit 05c78bad874aec8f76039c58eee625da61447178 parent 94b4f2dc97f4cf87b6bf89e2e78957fe8d87f0e1 Author: Nikolay Korotkiy <sikmir@gmail.com> Date: Mon, 17 Feb 2020 09:49:55 +0300 Cleanup Diffstat:
15 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/pkgs/default.nix b/pkgs/default.nix @@ -14,17 +14,17 @@ lib.makeScope newScope (self: with self; { click = python3Packages.callPackage ./development/python-modules/click { }; csvquote = callPackage ./tools/text/csvquote { }; csvtools = callPackage ./tools/text/csvtools { }; - datamaps = callPackage ./tools/datamaps { }; + datamaps = callPackage ./tools/geo/datamaps { }; docker-reg-tool = callPackage ./tools/docker-reg-tool { }; - elevation = python3Packages.callPackage ./tools/elevation { + elevation = python3Packages.callPackage ./tools/geo/elevation { inherit sources click; }; embox = callPackage ./embox { }; - gimgtools = callPackage ./tools/gimgtools { }; - gmaptool = callPackage ./tools/gmaptool { }; + gimgtools = callPackage ./tools/geo/gimgtools { }; + gmaptool = callPackage ./tools/geo/gmaptool { }; goldendict-dark-theme = callPackage ./data/themes/goldendict-themes/dark-theme.nix { }; - gpx-layer = perlPackages.callPackage ./tools/gpx-layer { + gpx-layer = perlPackages.callPackage ./tools/geo/gpx-layer { inherit sources; }; gpxelevations = python3Packages.callPackage ./development/python-modules/gpxelevations { @@ -37,12 +37,12 @@ lib.makeScope newScope (self: with self; { inherit sources; }; gpxsee-maps = callPackage ./data/maps/gpxsee-maps { }; - gpxtools = callPackage ./tools/gpxtools { }; - gt-bash-client = callPackage ./tools/gt-bash-client { }; - lsdreader = python3Packages.callPackage ./tools/lsdreader { + gpxtools = callPackage ./tools/geo/gpxtools { }; + gt-bash-client = callPackage ./tools/dict/gt-bash-client { }; + lsdreader = python3Packages.callPackage ./tools/dict/lsdreader { inherit sources; }; - gt4gd = python3Packages.callPackage ./tools/gt4gd { + gt4gd = python3Packages.callPackage ./tools/dict/gt4gd { inherit sources; }; hiblovgpsmap = callPackage ./data/maps/hiblovgpsmap { }; @@ -53,7 +53,7 @@ lib.makeScope newScope (self: with self; { mercantile = python3Packages.callPackage ./development/python-modules/mercantile { inherit sources; }; - openmtbmap_openvelomap_linux = callPackage ./tools/openmtbmap_openvelomap_linux { }; + openmtbmap_openvelomap_linux = callPackage ./tools/geo/openmtbmap_openvelomap_linux { }; openorienteering-mapper = libsForQt5.callPackage ./applications/openorienteering-mapper { inherit sources; }; @@ -71,15 +71,15 @@ lib.makeScope newScope (self: with self; { stardict-tools = # Needed for nixos-19.09 if pkgs ? libmysql - then callPackage ./tools/stardict-tools { + then callPackage ./tools/dict/stardict-tools { libmysqlclient = libmysql; } - else callPackage ./tools/stardict-tools { }; - supermercado = python3Packages.callPackage ./tools/supermercado { + else callPackage ./tools/dict/stardict-tools { }; + supermercado = python3Packages.callPackage ./tools/geo/supermercado { inherit sources mercantile; }; supload = callPackage ./tools/supload { }; - tpkutils = python3Packages.callPackage ./tools/tpkutils { + tpkutils = python3Packages.callPackage ./tools/geo/tpkutils { inherit sources mercantile pymbtiles; }; }) diff --git a/pkgs/tools/gt-bash-client/default.nix b/pkgs/tools/dict/gt-bash-client/default.nix diff --git a/pkgs/tools/gt4gd/default.nix b/pkgs/tools/dict/gt4gd/default.nix diff --git a/pkgs/tools/lsdreader/default.nix b/pkgs/tools/dict/lsdreader/default.nix diff --git a/pkgs/tools/stardict-tools/default.nix b/pkgs/tools/dict/stardict-tools/default.nix diff --git a/pkgs/tools/datamaps/default.nix b/pkgs/tools/geo/datamaps/default.nix diff --git a/pkgs/tools/elevation/default.nix b/pkgs/tools/geo/elevation/default.nix diff --git a/pkgs/tools/gimgtools/default.nix b/pkgs/tools/geo/gimgtools/default.nix diff --git a/pkgs/tools/gmaptool/default.nix b/pkgs/tools/geo/gmaptool/default.nix diff --git a/pkgs/tools/gpx-layer/default.nix b/pkgs/tools/geo/gpx-layer/default.nix diff --git a/pkgs/tools/gpxtools/default.nix b/pkgs/tools/geo/gpxtools/default.nix diff --git a/pkgs/tools/openmtbmap_openvelomap_linux/0001-fix-path.patch b/pkgs/tools/geo/openmtbmap_openvelomap_linux/0001-fix-path.patch diff --git a/pkgs/tools/openmtbmap_openvelomap_linux/default.nix b/pkgs/tools/geo/openmtbmap_openvelomap_linux/default.nix diff --git a/pkgs/tools/supermercado/default.nix b/pkgs/tools/geo/supermercado/default.nix diff --git a/pkgs/tools/tpkutils/default.nix b/pkgs/tools/geo/tpkutils/default.nix