commit 6bff140fd5b9fe80d48912d3dad0431ca2ecf15f parent b8ddd86d838729a365c679556345bb252f0005ce Author: Nikolay Korotkiy <sikmir@gmail.com> Date: Sun, 2 Feb 2020 19:23:09 +0300 Enhance the structure of pkgs Diffstat:
40 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/default.nix b/default.nix @@ -17,115 +17,115 @@ in rec { modules = import ./modules; # NixOS modules overlays = import ./overlays; # nixpkgs overlays - cfiles = callPackage ./pkgs/cfiles { + cfiles = callPackage ./pkgs/tools/cfiles { inherit ueberzug; inherit (sources) cfiles; }; - click = python3Packages.callPackage ./pkgs/click { }; - csvquote = callPackage ./pkgs/csvquote { + click = python3Packages.callPackage ./pkgs/development/python-modules/click { }; + csvquote = callPackage ./pkgs/tools/text/csvquote { inherit (sources) csvquote; }; - csvtools = callPackage ./pkgs/csvtools { + csvtools = callPackage ./pkgs/tools/text/csvtools { inherit (sources) csvtools; }; - datamaps = callPackage ./pkgs/datamaps { + datamaps = callPackage ./pkgs/tools/datamaps { inherit (sources) datamaps; }; - docker-reg-tool = callPackage ./pkgs/docker-reg-tool { + docker-reg-tool = callPackage ./pkgs/tools/docker-reg-tool { inherit (sources) docker-reg-tool; }; - elevation = python3Packages.callPackage ./pkgs/elevation { + elevation = python3Packages.callPackage ./pkgs/tools/elevation { inherit click; inherit (sources) elevation; }; embox = callPackage ./pkgs/embox { inherit (sources) embox; }; - gmaptool = callPackage ./pkgs/gmaptool { }; + gmaptool = callPackage ./pkgs/tools/gmaptool { }; goldendict-dark-theme = - callPackage ./pkgs/goldendict-themes/dark-theme.nix { }; + callPackage ./pkgs/data/themes/goldendict-themes/dark-theme.nix { }; gpx-layer = perlPackages.callPackage ./pkgs/gpx-layer { inherit (sources) gpx-layer; }; - gpxelevations = python3Packages.callPackage ./pkgs/gpxelevations { + gpxelevations = python3Packages.callPackage ./pkgs/development/python-modules/gpxelevations { inherit (sources) gpxelevations; }; - gpxlab = libsForQt5.callPackage ./pkgs/gpxlab { + gpxlab = libsForQt5.callPackage ./pkgs/applications/gpxlab { inherit (sources) gpxlab; }; - gpxsee = libsForQt5.callPackage ./pkgs/gpxsee { + gpxsee = libsForQt5.callPackage ./pkgs/applications/gpxsee { inherit (sources) gpxsee; }; - gpxsee-maps = callPackage ./pkgs/gpxsee-maps { + gpxsee-maps = callPackage ./pkgs/data/maps/gpxsee-maps { inherit (sources) gpxsee-maps; }; - gpxtools = callPackage ./pkgs/gpxtools { + gpxtools = callPackage ./pkgs/tools/gpxtools { inherit (sources) gpxtools; }; - gt-bash-client = callPackage ./pkgs/gt-bash-client { + gt-bash-client = callPackage ./pkgs/tools/gt-bash-client { inherit (sources) gt-bash-client; }; - lsd2dsl = libsForQt5.callPackage ./pkgs/lsd2dsl { + lsd2dsl = libsForQt5.callPackage ./pkgs/tools/lsd2dsl { inherit (sources) lsd2dsl; }; - lsdreader = python3Packages.callPackage ./pkgs/lsdreader { + lsdreader = python3Packages.callPackage ./pkgs/tools/lsdreader { inherit (sources) lsdreader; }; - gt4gd = python3Packages.callPackage ./pkgs/gt4gd { + gt4gd = python3Packages.callPackage ./pkgs/tools/gt4gd { inherit (sources) google-translate-for-goldendict; }; - hiblovgpsmap = callPackage ./pkgs/hiblovgpsmap { }; - ish = callPackage ./pkgs/ish { }; - libshell = callPackage ./pkgs/libshell { + hiblovgpsmap = callPackage ./pkgs/data/maps/hiblovgpsmap { }; + ish = callPackage ./pkgs/tools/networking/ish { }; + libshell = callPackage ./pkgs/development/libraries/libshell { inherit (sources) libshell; }; - mapsoft = callPackage ./pkgs/mapsoft { + mapsoft = callPackage ./pkgs/applications/mapsoft { inherit libshell; inherit (sources) mapsoft; }; - mbtileserver = callPackage ./pkgs/mbtileserver { + mbtileserver = callPackage ./pkgs/servers/mbtileserver { inherit (sources) mbtileserver; }; - mbutil = python3Packages.callPackage ./pkgs/mbutil { + mbutil = python3Packages.callPackage ./pkgs/tools/mbutil { inherit (sources) mbutil; }; - mercantile = python3Packages.callPackage ./pkgs/mercantile { + mercantile = python3Packages.callPackage ./pkgs/development/python-modules/mercantile { inherit (sources) mercantile; }; - openmtbmap_openvelomap_linux = callPackage ./pkgs/openmtbmap_openvelomap_linux { + openmtbmap_openvelomap_linux = callPackage ./pkgs/tools/openmtbmap_openvelomap_linux { inherit gmaptool; inherit (sources) openmtbmap_openvelomap_linux; }; - openorienteering-mapper = libsForQt5.callPackage ./pkgs/openorienteering-mapper { + openorienteering-mapper = libsForQt5.callPackage ./pkgs/applications/openorienteering-mapper { inherit (sources) mapper; }; - ptunnel = callPackage ./pkgs/ptunnel { }; - pymbtiles = python3Packages.callPackage ./pkgs/pymbtiles { + ptunnel = callPackage ./pkgs/tools/networking/ptunnel { }; + pymbtiles = python3Packages.callPackage ./pkgs/development/python-modules/pymbtiles { inherit (sources) pymbtiles; }; - qmapshack-onlinemaps = callPackage ./pkgs/qmapshack-onlinemaps { }; - redict = libsForQt5.callPackage ./pkgs/redict { + qmapshack-onlinemaps = callPackage ./pkgs/data/maps/qmapshack-onlinemaps { }; + redict = libsForQt5.callPackage ./pkgs/applications/redict { inherit (sources) redict; }; stardict-tools = # Needed for nixos-19.09 if pkgs ? libmysql - then callPackage ./pkgs/stardict-tools { + then callPackage ./pkgs/tools/stardict-tools { inherit (sources) stardict-3; libmysqlclient = libmysql; } - else callPackage ./pkgs/stardict-tools { + else callPackage ./pkgs/tools/stardict-tools { inherit (sources) stardict-3; }; - supload = callPackage ./pkgs/supload { + supload = callPackage ./pkgs/tools/supload { inherit (sources) supload; }; - tpkutils = python3Packages.callPackage ./pkgs/tpkutils { + tpkutils = python3Packages.callPackage ./pkgs/tools/tpkutils { inherit mercantile; inherit pymbtiles; inherit (sources) tpkutils; }; - ueberzug = python3Packages.callPackage ./pkgs/ueberzug { + ueberzug = python3Packages.callPackage ./pkgs/tools/ueberzug { inherit (sources) ueberzug; }; } diff --git a/pkgs/gpxlab/default.nix b/pkgs/applications/gpxlab/default.nix diff --git a/pkgs/gpxsee/default.nix b/pkgs/applications/gpxsee/default.nix diff --git a/pkgs/mapsoft/0001-fix-build.patch b/pkgs/applications/mapsoft/0001-fix-build.patch diff --git a/pkgs/mapsoft/default.nix b/pkgs/applications/mapsoft/default.nix diff --git a/pkgs/openorienteering-mapper/default.nix b/pkgs/applications/openorienteering-mapper/default.nix diff --git a/pkgs/redict/default.nix b/pkgs/applications/redict/default.nix diff --git a/pkgs/gpxsee-maps/default.nix b/pkgs/data/maps/gpxsee-maps/default.nix diff --git a/pkgs/hiblovgpsmap/default.nix b/pkgs/data/maps/hiblovgpsmap/default.nix diff --git a/pkgs/qmapshack-onlinemaps/default.nix b/pkgs/data/maps/qmapshack-onlinemaps/default.nix diff --git a/pkgs/goldendict-themes/dark-theme.nix b/pkgs/data/themes/goldendict-themes/dark-theme.nix diff --git a/pkgs/libshell/default.nix b/pkgs/development/libraries/libshell/default.nix diff --git a/pkgs/click/default.nix b/pkgs/development/python-modules/click/default.nix diff --git a/pkgs/click/fix-paths.patch b/pkgs/development/python-modules/click/fix-paths.patch diff --git a/pkgs/gpxelevations/default.nix b/pkgs/development/python-modules/gpxelevations/default.nix diff --git a/pkgs/mercantile/default.nix b/pkgs/development/python-modules/mercantile/default.nix diff --git a/pkgs/pymbtiles/default.nix b/pkgs/development/python-modules/pymbtiles/default.nix diff --git a/pkgs/mbtileserver/default.nix b/pkgs/servers/mbtileserver/default.nix diff --git a/pkgs/cfiles/default.nix b/pkgs/tools/cfiles/default.nix diff --git a/pkgs/datamaps/default.nix b/pkgs/tools/datamaps/default.nix diff --git a/pkgs/docker-reg-tool/default.nix b/pkgs/tools/docker-reg-tool/default.nix diff --git a/pkgs/elevation/default.nix b/pkgs/tools/elevation/default.nix diff --git a/pkgs/gmaptool/default.nix b/pkgs/tools/gmaptool/default.nix diff --git a/pkgs/gpx-layer/default.nix b/pkgs/tools/gpx-layer/default.nix diff --git a/pkgs/gpxtools/default.nix b/pkgs/tools/gpxtools/default.nix diff --git a/pkgs/gt-bash-client/default.nix b/pkgs/tools/gt-bash-client/default.nix diff --git a/pkgs/gt4gd/default.nix b/pkgs/tools/gt4gd/default.nix diff --git a/pkgs/lsd2dsl/default.nix b/pkgs/tools/lsd2dsl/default.nix diff --git a/pkgs/lsdreader/default.nix b/pkgs/tools/lsdreader/default.nix diff --git a/pkgs/mbutil/default.nix b/pkgs/tools/mbutil/default.nix diff --git a/pkgs/ish/default.nix b/pkgs/tools/networking/ish/default.nix diff --git a/pkgs/ptunnel/default.nix b/pkgs/tools/networking/ptunnel/default.nix diff --git a/pkgs/openmtbmap_openvelomap_linux/0001-fix-path.patch b/pkgs/tools/openmtbmap_openvelomap_linux/0001-fix-path.patch diff --git a/pkgs/openmtbmap_openvelomap_linux/default.nix b/pkgs/tools/openmtbmap_openvelomap_linux/default.nix diff --git a/pkgs/stardict-tools/default.nix b/pkgs/tools/stardict-tools/default.nix diff --git a/pkgs/supload/default.nix b/pkgs/tools/supload/default.nix diff --git a/pkgs/csvquote/default.nix b/pkgs/tools/text/csvquote/default.nix diff --git a/pkgs/csvtools/default.nix b/pkgs/tools/text/csvtools/default.nix diff --git a/pkgs/tpkutils/default.nix b/pkgs/tools/tpkutils/default.nix diff --git a/pkgs/ueberzug/default.nix b/pkgs/tools/ueberzug/default.nix