diff --git a/pkgs/build-support/fetchgdrive/default.nix b/pkgs/build-support/fetchgdrive/default.nix

new file mode 100644

index 0000000000000000000000000000000000000000..d2776c2bf7595db5dbf4b35225efea37950c7709

--- /dev/null

+++ b/pkgs/build-support/fetchgdrive/default.nix

@@ -0,0 +1,7 @@

+{ fetchurl }:

+{ id, ... } @ args:

+(fetchurl ({

• url = "https://drive.google.com/uc?export=download&id=${id}";

+} // removeAttrs args [ "id" ]))

diff --git a/pkgs/data/maps/hiblovgpsmap/default.nix b/pkgs/data/maps/hiblovgpsmap/default.nix

index 9f6a37ce63a8a4e2346c74aeb6d4b88d7095b912..e2172def5df818f72be1001d63507362b33e5b91 100644

--- a/pkgs/data/maps/hiblovgpsmap/default.nix

+++ b/pkgs/data/maps/hiblovgpsmap/default.nix

@@ -1,11 +1,11 @@

-{ stdenv, fetchurl, unzip }:

+{ stdenv, fetchgdrive, unzip }:

stdenv.mkDerivation rec {

pname = "hiblovgpsmap";

version = "2019-10-28";

• src = fetchurl {

• url = "https://drive.google.com/uc?export=download&id=10aAOKY8U7TQvFvuWBkwTei9iP3-cUvoE";

• src = fetchgdrive {

• id = "10aAOKY8U7TQvFvuWBkwTei9iP3-cUvoE";

 sha256 = "1079bn8rkdfsbqivxkm3zi327k2i4k5p20rr2jw7gacfsvdk4954";

 name = "OV-Hib-Lov-${stdenv.lib.replaceStrings [ "-" ] [ "" ] version}-1.02.zip";

};

diff --git a/pkgs/default.nix b/pkgs/default.nix

index 5a1b9895c8112bb846b654847557839cf5e03316..0033a57e32da8e90551c9e15137cb79cd932c574 100644

--- a/pkgs/default.nix

+++ b/pkgs/default.nix

@@ -6,13 +6,86 @@ lib.makeScope newScope (

self: with self; {

 inherit sources;

• APPLICATIONS

• gpxlab = libsForQt5.callPackage ./applications/gpxlab {

•  inherit sources;
  

• };

• gpxsee = libsForQt5.callPackage ./applications/gpxsee {

•  inherit sources;
  

• };

• mapsoft = callPackage ./applications/mapsoft {};

• mapsoft2 = callPackage ./applications/mapsoft/2.nix {};

• openorienteering-mapper = libsForQt5.callPackage ./applications/openorienteering-mapper {

•  inherit sources;
  

• };

• redict = libsForQt5.callPackage ./applications/redict {

•  inherit sources;
  

• };

• BUILD SUPPORT

• fetchgdrive = callPackage ./build-support/fetchgdrive { };

• DATA

 cambridge = callPackage ./data/dicts/cambridge {};

• cfiles = callPackage ./tools/cfiles {};

• cgpsmapper = callPackage ./tools/geo/cgpsmapper {};

• macmillan = callPackage ./data/dicts/macmillan {};

• webster = callPackage ./data/dicts/webster {};

• gpxsee-maps = callPackage ./data/maps/gpxsee-maps {};

• hiblovgpsmap = callPackage ./data/maps/hiblovgpsmap {};

• maptourist = callPackage ./data/maps/maptourist {};

• opentopomap = callPackage ./data/maps/opentopomap {};

• qmapshack-onlinemaps = callPackage ./data/maps/qmapshack-onlinemaps {};

• qmapshack-routinodb = callPackage ./data/maps/qmapshack-routinodb {};

• qmapshack-dem = callPackage ./data/maps/qmapshack-dem {};

• slazav-hr = callPackage ./data/maps/slazav/hr.nix {};

• slazav-podm = callPackage ./data/maps/slazav/podm.nix {};

• goldendict-dark-theme =

•  callPackage ./data/themes/goldendict-themes/dark-theme.nix {};
  

• qtpbfimageplugin-styles = callPackage ./data/themes/qtpbfimageplugin-styles {};

• DEVELOPMENT / TOOLS

• gef = callPackage ./development/tools/gef {};

• DEVELOPMENT / LIBRARIES

• libshell = callPackage ./development/libraries/libshell {};

• DEVELOPMENT / PERL MODULES

• perlPackages = (

•  callPackage ./perl-packages.nix {}
  

• ) // pkgs.perlPackages // {

•  recurseForDerivations = false;
  

• };

• DEVELOPMENT / PYTHON MODULES

 cheetah3 = python3Packages.callPackage ./development/python-modules/cheetah3 {

   inherit sources;

 };

 click = python3Packages.callPackage ./development/python-modules/click {};

• gpxelevations = python3Packages.callPackage ./development/python-modules/gpxelevations {

•  inherit sources;
  

• };

• mercantile = python3Packages.callPackage ./development/python-modules/mercantile {

•  inherit sources;
  

• };

• pyephem = python3Packages.callPackage ./development/python-modules/pyephem {

•  inherit sources;
  

• };

• pymbtiles = python3Packages.callPackage ./development/python-modules/pymbtiles {

•  inherit sources;
  

• };

• TOOLS

• cfiles = callPackage ./tools/cfiles {};

• cgpsmapper = callPackage ./tools/geo/cgpsmapper {};

 csvquote = callPackage ./tools/text/csvquote {};

 csvtools = callPackage ./tools/text/csvtools {};

 datamaps = callPackage ./tools/geo/datamaps {};

@@ -20,25 +93,11 @@ docker-reg-tool = callPackage ./tools/docker-reg-tool {};

 elevation = python3Packages.callPackage ./tools/geo/elevation {

   inherit sources click;

 };

• embox = callPackage ./embox {};

• gef = callPackage ./development/tools/gef {};

 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/geo/gpx-layer {

   inherit sources;

 };

• gpxelevations = python3Packages.callPackage ./development/python-modules/gpxelevations {

•  inherit sources;
  

• };

• gpxlab = libsForQt5.callPackage ./applications/gpxlab {

•  inherit sources;
  

• };

• gpxsee = libsForQt5.callPackage ./applications/gpxsee {

•  inherit sources;
  

• };

• gpxsee-maps = callPackage ./data/maps/gpxsee-maps {};

 gpxtools = callPackage ./tools/geo/gpxtools {};

 gt-bash-client = callPackage ./tools/dict/gt-bash-client {};

 lsdreader = python3Packages.callPackage ./tools/dict/lsdreader {

@@ -47,47 +106,18 @@ };

 gt4gd = python3Packages.callPackage ./tools/dict/gt4gd {

   inherit sources;

 };

• hiblovgpsmap = callPackage ./data/maps/hiblovgpsmap {};

 i18n-editor = callPackage ./tools/i18n-editor {};

 ish = callPackage ./tools/networking/ish {};

• libshell = callPackage ./development/libraries/libshell {};

• macmillan = callPackage ./data/dicts/macmillan {};

• mapsoft = callPackage ./applications/mapsoft {};

• mapsoft2 = callPackage ./applications/mapsoft/2.nix {};

• maptourist = callPackage ./data/maps/maptourist {};

• mbtileserver = callPackage ./servers/mbtileserver {};

• mercantile = python3Packages.callPackage ./development/python-modules/mercantile {

•  inherit sources;
  

• };

 morse-talk = python3Packages.callPackage ./tools/morse-talk {

   inherit sources;

 };

 openmtbmap_openvelomap_linux = callPackage ./tools/geo/openmtbmap_openvelomap_linux {};

• openorienteering-mapper = libsForQt5.callPackage ./applications/openorienteering-mapper {

•  inherit sources;
  

• };

• opentopomap = callPackage ./data/maps/opentopomap {};

 osm2mp = perlPackages.callPackage ./tools/geo/osm2mp {

   inherit sources;

   inherit (perlPackages) GeoOpenstreetmapParser MatchSimple MathPolygon MathPolygonTree TreeR;

 };

 ptunnel = callPackage ./tools/networking/ptunnel {};

• pyephem = python3Packages.callPackage ./development/python-modules/pyephem {

•  inherit sources;
  

• };

• pymbtiles = python3Packages.callPackage ./development/python-modules/pymbtiles {

•  inherit sources;
  

• };

• qmapshack-onlinemaps = callPackage ./data/maps/qmapshack-onlinemaps {};

• qmapshack-routinodb = callPackage ./data/maps/qmapshack-routinodb {};

• qmapshack-dem = callPackage ./data/maps/qmapshack-dem {};

• qtpbfimageplugin-styles = callPackage ./data/themes/qtpbfimageplugin-styles {};

• redict = libsForQt5.callPackage ./applications/redict {

•  inherit sources;
  

• };

 sendmap20 = callPackage ./tools/geo/sendmap20 {};

• slazav-hr = callPackage ./data/maps/slazav/hr.nix {};

• slazav-podm = callPackage ./data/maps/slazav/podm.nix {};

 stardict-tools =

   # Needed for nixos-19.09

   if pkgs ? libmysql

@@ -102,13 +132,14 @@ supload = callPackage ./tools/supload {};

 tpkutils = python3Packages.callPackage ./tools/geo/tpkutils {

   inherit sources mercantile pymbtiles;

 };

• webster = callPackage ./data/dicts/webster {};

 xfractint = callPackage ./tools/xfractint {};

• perlPackages = (

•  callPackage ./perl-packages.nix {}
  

• ) // pkgs.perlPackages // {

•  recurseForDerivations = false;
  

• };

• SERVERS

• mbtileserver = callPackage ./servers/mbtileserver {};

• MISC

• embox = callPackage ./embox {};

}

)