commit e6364d2ff978a5ff414b6ae2cd0512a570175bf2 parent 29b309e1861d85a057961be27d83a8081288b873 Author: Nikolay Korotkiy <sikmir@gmail.com> Date: Mon, 18 Jan 2021 23:07:52 +0300 Move garmin, gemini and suckless packages to separate directories Diffstat:
30 files changed, 44 insertions(+), 32 deletions(-)
diff --git a/pkgs/default.nix b/pkgs/default.nix @@ -10,7 +10,6 @@ lib.makeScope newScope ( amethyst-bin = callPackage ./applications/window-managers/amethyst/bin.nix { }; anki-bin = callPackage ./applications/anki/bin.nix { }; - basecamp = callPackage ./applications/gis/basecamp { }; goldencheetah-bin = callPackage ./applications/goldencheetah/bin.nix { }; goldendict-bin = callPackage ./applications/goldendict/bin.nix { }; gpxlab = libsForQt5.callPackage ./applications/gpxlab { @@ -99,7 +98,6 @@ lib.makeScope newScope ( ### DEVELOPMENT / TOOLS gef = callPackage ./development/tools/gef { }; - kiln = callPackage ./development/tools/kiln { }; how-to-use-pvs-studio-free = callPackage ./development/tools/pvs-studio/how-to-use-pvs-studio-free.nix { }; pvs-studio = callPackage ./development/tools/pvs-studio { }; xtr = callPackage ./development/tools/xtr { }; @@ -148,9 +146,7 @@ lib.makeScope newScope ( ### TOOLS apibackuper = callPackage ./tools/networking/apibackuper { }; - blind = callPackage ./tools/video/blind { }; cfiles = callPackage ./tools/cfiles { }; - cgpsmapper = callPackage ./tools/geo/cgpsmapper { }; csvquote = callPackage ./tools/text/csvquote { }; csvtools = callPackage ./tools/text/csvtools { }; datamaps = callPackage ./tools/geo/datamaps { }; @@ -159,17 +155,8 @@ lib.makeScope newScope ( elevation = callPackage ./tools/geo/elevation { click = click-6-7; }; - farbfeld-utils = callPackage ./tools/graphics/farbfeld-utils { }; fx-bin = callPackage ./tools/text/fx/bin.nix { }; - garmin-uploader = callPackage ./tools/misc/garmin-uploader { }; - garminimg = libsForQt5.callPackage ./tools/geo/garminimg { - inherit sources; - }; gdcv = callPackage ./tools/dict/gdcv { }; - gimgtools = callPackage ./tools/geo/gimgtools { }; - gloggery = callPackage ./tools/misc/gloggery { }; - gmaptool = callPackage ./tools/geo/gmaptool { }; - gmni = callPackage ./tools/networking/gmni { }; go-staticmaps = callPackage ./tools/geo/go-staticmaps { }; gpx-layer = perlPackages.callPackage ./tools/geo/gpx-layer { inherit sources; @@ -178,26 +165,14 @@ lib.makeScope newScope ( gpxtrackposter = callPackage ./tools/geo/gpxtrackposter { }; gt-bash-client = callPackage ./tools/dict/gt-bash-client { }; gt4gd = callPackage ./tools/dict/gt4gd { }; - gurl = callPackage ./tools/networking/gurl { }; - hurl = callPackage ./tools/networking/hurl { }; - imgdecode = callPackage ./tools/geo/imgdecode { }; - imscript = callPackage ./tools/graphics/imscript { }; ish = callPackage ./tools/networking/ish { }; lazyscraper = callPackage ./tools/text/lazyscraper { }; - lel = callPackage ./tools/graphics/lel { }; lsdreader = callPackage ./tools/dict/lsdreader { }; map-tiler = callPackage ./tools/geo/map-tiler { }; - md2gemini = callPackage ./tools/text/md2gemini { }; morse-talk = callPackage ./tools/morse-talk { }; musig = callPackage ./tools/audio/musig { }; - ocad2img = perlPackages.callPackage ./tools/geo/ocad2img { - inherit cgpsmapper ocad2mp fetchwebarchive; - }; - ocad2mp = callPackage ./tools/geo/ocad2mp { }; odict = callPackage ./tools/dict/odict { }; - openmtbmap = callPackage ./tools/geo/openmtbmap { }; osm-area-tools = callPackage ./tools/geo/osm-area-tools { }; - osm2mp = perlPackages.callPackage ./tools/geo/osm2mp { inherit sources; inherit (perlPackages) GeoOpenstreetmapParser MatchSimple MathPolygon MathPolygonTree TreeR; }; @@ -208,9 +183,6 @@ lib.makeScope newScope ( }; ptunnel = callPackage ./tools/networking/ptunnel { }; py-staticmaps = callPackage ./tools/geo/py-staticmaps { }; - saait = callPackage ./tools/misc/saait { }; - sendmap20 = callPackage ./tools/geo/sendmap20 { }; - stagit = callPackage ./tools/misc/stagit { }; stardict-tools = # Needed for nixos-19.09 if pkgs ? libmysql @@ -231,16 +203,56 @@ lib.makeScope newScope ( ascii-dash = callPackage ./games/ascii-dash { }; + ### GARMIN + + basecamp = callPackage ./garmin/basecamp { }; + cgpsmapper = callPackage ./garmin/cgpsmapper { }; + garmin-uploader = callPackage ./garmin/garmin-uploader { }; + garminimg = libsForQt5.callPackage ./garmin/garminimg { + inherit sources; + }; + gimgtools = callPackage ./garmin/gimgtools { }; + gmaptool = callPackage ./garmin/gmaptool { }; + imgdecode = callPackage ./garmin/imgdecode { }; + ocad2img = perlPackages.callPackage ./garmin/ocad2img { + inherit cgpsmapper ocad2mp fetchwebarchive; + }; + ocad2mp = callPackage ./garmin/ocad2mp { }; + openmtbmap = callPackage ./garmin/openmtbmap { }; + osm2mp = perlPackages.callPackage ./garmin/osm2mp { + inherit sources; + inherit (perlPackages) GeoOpenstreetmapParser MatchSimple MathPolygon MathPolygonTree TreeR; + }; + sendmap20 = callPackage ./garmin/sendmap20 { }; + + ### GEMINI + + geminid = callPackage ./gemini/geminid { }; + gloggery = callPackage ./gemini/gloggery { }; + gmni = callPackage ./gemini/gmni { }; + gmnisrv = callPackage ./gemini/gmnisrv { }; + gurl = callPackage ./gemini/gurl { }; + kiln = callPackage ./gemini/kiln { }; + md2gemini = callPackage ./gemini/md2gemini { }; + shavit = callPackage ./gemini/shavit { }; + ### SERVERS dict2rest = callPackage ./servers/dict2rest { }; elevation_server = callPackage ./servers/elevation_server { }; - geminid = callPackage ./servers/geminid { }; glauth = callPackage ./servers/glauth { }; - gmnisrv = callPackage ./servers/gmnisrv { }; nakarte = callPackage ./servers/nakarte { }; - quark = callPackage ./servers/quark { }; - shavit = callPackage ./servers/shavit { }; + + ### SUCKLESS + + blind = callPackage ./suckless/blind { }; + farbfeld-utils = callPackage ./suckless/farbfeld-utils { }; + hurl = callPackage ./suckless/hurl { }; + imscript = callPackage ./suckless/imscript { }; + lel = callPackage ./suckless/lel { }; + quark = callPackage ./suckless/quark { }; + saait = callPackage ./suckless/saait { }; + stagit = callPackage ./suckless/stagit { }; ### MISC diff --git a/pkgs/applications/gis/basecamp/default.nix b/pkgs/garmin/basecamp/default.nix diff --git a/pkgs/tools/geo/cgpsmapper/default.nix b/pkgs/garmin/cgpsmapper/default.nix diff --git a/pkgs/tools/misc/garmin-uploader/default.nix b/pkgs/garmin/garmin-uploader/default.nix diff --git a/pkgs/tools/geo/garminimg/default.nix b/pkgs/garmin/garminimg/default.nix diff --git a/pkgs/tools/geo/gimgtools/default.nix b/pkgs/garmin/gimgtools/default.nix diff --git a/pkgs/tools/geo/gmaptool/default.nix b/pkgs/garmin/gmaptool/default.nix diff --git a/pkgs/tools/geo/imgdecode/default.nix b/pkgs/garmin/imgdecode/default.nix diff --git a/pkgs/tools/geo/ocad2img/default.nix b/pkgs/garmin/ocad2img/default.nix diff --git a/pkgs/tools/geo/ocad2mp/default.nix b/pkgs/garmin/ocad2mp/default.nix diff --git a/pkgs/tools/geo/openmtbmap/0001-fix-path.patch b/pkgs/garmin/openmtbmap/0001-fix-path.patch diff --git a/pkgs/tools/geo/openmtbmap/default.nix b/pkgs/garmin/openmtbmap/default.nix diff --git a/pkgs/tools/geo/osm2mp/default.nix b/pkgs/garmin/osm2mp/default.nix diff --git a/pkgs/tools/geo/sendmap20/default.nix b/pkgs/garmin/sendmap20/default.nix diff --git a/pkgs/servers/geminid/default.nix b/pkgs/gemini/geminid/default.nix diff --git a/pkgs/tools/misc/gloggery/default.nix b/pkgs/gemini/gloggery/default.nix diff --git a/pkgs/tools/networking/gmni/default.nix b/pkgs/gemini/gmni/default.nix diff --git a/pkgs/servers/gmnisrv/default.nix b/pkgs/gemini/gmnisrv/default.nix diff --git a/pkgs/tools/networking/gurl/default.nix b/pkgs/gemini/gurl/default.nix diff --git a/pkgs/development/tools/kiln/default.nix b/pkgs/gemini/kiln/default.nix diff --git a/pkgs/tools/text/md2gemini/default.nix b/pkgs/gemini/md2gemini/default.nix diff --git a/pkgs/servers/shavit/default.nix b/pkgs/gemini/shavit/default.nix diff --git a/pkgs/tools/video/blind/default.nix b/pkgs/suckless/blind/default.nix diff --git a/pkgs/tools/graphics/farbfeld-utils/default.nix b/pkgs/suckless/farbfeld-utils/default.nix diff --git a/pkgs/tools/networking/hurl/default.nix b/pkgs/suckless/hurl/default.nix diff --git a/pkgs/tools/graphics/imscript/default.nix b/pkgs/suckless/imscript/default.nix diff --git a/pkgs/tools/graphics/lel/default.nix b/pkgs/suckless/lel/default.nix diff --git a/pkgs/servers/quark/default.nix b/pkgs/suckless/quark/default.nix diff --git a/pkgs/tools/misc/saait/default.nix b/pkgs/suckless/saait/default.nix diff --git a/pkgs/tools/misc/stagit/default.nix b/pkgs/suckless/stagit/default.nix