diff --git a/nix/sources.json b/nix/sources.json

index eb7e98ca8f84792b3f5fe396df14d67ea73101f1..8dda466af125c6eacfad490f78b86657ab1898a7 100644

--- a/nix/sources.json

+++ b/nix/sources.json

@@ -118,27 +118,27 @@ "url_template": "https://github.com///archive/.tar.gz"

 },

 "geofabrik-estonia": {

     "builtin": false,

•    "sha256": "10c24p6ch833lkxj3cf2cvi2jfcrqnwhzd02jrhb061q2zw333vk",
  

•    "sha256": "1q193jgp7zbnqyna956b518baixri6s6qkscqr2smbqm5py3ws7m",
  

     "type": "file",

•    "url": "https://download.geofabrik.de/europe/estonia-200515.osm.pbf",
  

•    "url": "https://download.geofabrik.de/europe/estonia-200517.osm.pbf",
  

     "url_template": "https://download.geofabrik.de/europe/estonia-<version>.osm.pbf",

•    "version": "200515"
  

•    "version": "200517"
  

 },

 "geofabrik-finland": {

     "builtin": false,

•    "sha256": "1q9cw2rg5dq9zrpgx5r493i1i32hajih20cb6ba2nqkmpsbbghn9",
  

•    "sha256": "0k03y8lp92gkvxlj9n1zxhjdfmpflqvix4rj0p9xbc5fkgaf43rv",
  

     "type": "file",

•    "url": "https://download.geofabrik.de/europe/finland-200515.osm.pbf",
  

•    "url": "https://download.geofabrik.de/europe/finland-200517.osm.pbf",
  

     "url_template": "https://download.geofabrik.de/europe/finland-<version>.osm.pbf",

•    "version": "200515"
  

•    "version": "200517"
  

 },

 "geofabrik-russia-nwfd": {

     "builtin": false,

•    "sha256": "0w7s0s53mfxaq5akgc8irmv29r3npidy6a9qrr3cjkdijkvz08y9",
  

•    "sha256": "1n78i5h39dfllr0hl5kzvjxlbm4ph1kw29hrgpg4a6gsgki6xj33",
  

     "type": "file",

•    "url": "https://download.geofabrik.de/russia/northwestern-fed-district-200515.osm.pbf",
  

•    "url": "https://download.geofabrik.de/russia/northwestern-fed-district-200517.osm.pbf",
  

     "url_template": "https://download.geofabrik.de/russia/northwestern-fed-district-<version>.osm.pbf",

•    "version": "200515"
  

•    "version": "200517"
  

 },

 "gimgtools": {

     "branch": "master",

@@ -316,10 +316,10 @@ "description": "OpenOrienteering Mapper is a software for creating maps for the orienteering sport",

     "homepage": "https://www.openorienteering.org/apps/mapper/",

     "owner": "OpenOrienteering",

     "repo": "mapper",

•    "rev": "1546944847a8c4214758a7e74dfc3beedf760474",
  

•    "sha256": "0rxxjwppi6xxp1gqa1rnlsgkfhgm2syaj2rdpqhgf89yk274wvmh",
  

•    "rev": "8b8f00f91c284839587718680fe7d2fd44ceeb07",
  

•    "sha256": "1wk4bn4lbjy3g6k1hk6zlvdzl0r5k9d9iybwl8lxi2lxqp10z3ab",
  

     "type": "tarball",

•    "url": "https://github.com/OpenOrienteering/mapper/archive/1546944847a8c4214758a7e74dfc3beedf760474.tar.gz",
  

•    "url": "https://github.com/OpenOrienteering/mapper/archive/8b8f00f91c284839587718680fe7d2fd44ceeb07.tar.gz",
  

     "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"

 },

 "mapsoft": {

@@ -340,11 +340,11 @@ "builtin": false,

     "description": "Ежедневная сборка карт из данных OpenStreetMap для навигационных приборов и приложений Garmin",

     "homepage": "https://maptourist.org",

     "region": "szfo",

•    "sha256": "0v6xd1x1swncq34p6yn6l7kqyl0mjmvxlh3vfi1ri1idwc5gq040",
  

•    "sha256": "1jkxm6jn2ggnx2akpmkvkzxr8wlkcx32nx8hbb2sqrpk177x8m5a",
  

     "type": "file",

•    "url": "https://maptourist.org/osm-garmin/archive/OSM-MapTourist-szfo-RU_2020-05-16.zip",
  

•    "url": "https://maptourist.org/osm-garmin/archive/OSM-MapTourist-szfo-RU_2020-05-18.zip",
  

     "url_template": "https://maptourist.org/osm-garmin/archive/OSM-MapTourist-<region>-RU_<version>.zip",

•    "version": "2020-05-16"
  

•    "version": "2020-05-18"
  

 },

 "mbtileserver": {

     "branch": "master",

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

index 02811e85f6e2cf39838b23e68973d51df9194684..ea873e7af15b0109c351fe5ef174d3e7eceb0cd4 100644

--- a/pkgs/data/maps/gpxsee-poi/default.nix

+++ b/pkgs/data/maps/gpxsee-poi/default.nix

@@ -2,9 +2,9 @@ { lib, fetchurl, gzip, jq }:

{

geocachingSu = fetchurl {

• name = "geocaching_su-2020-05-12";

• name = "geocaching_su-2020-05-18";

 url = "https://nakarte.me/geocachingSu/geocaching_su2.json";

• sha256 = "0rn43yv4m4n1kqc26llffq70pcm03jrys15cxs8i5w61qw9y5dbn";

• sha256 = "17mg2qh4pqpi9524z2mi03xyrs9iyb2xqxmhj4qgwq1hwvlni64a";

 downloadToTemp = true;

 recursiveHash = true;

 preferLocalBuild = true;

@@ -68,9 +68,9 @@ };

};

westra = fetchurl {

• name = "westra-2020-05-12";

• name = "westra-2020-05-18";

 url = "https://nakarte.me/westraPasses/westra_passes.json";

• sha256 = "00wvlbz5r5ka21sh1bq7ij48qvc3ddjgj3n9x1gr2ygz1cxnbfvh";

• sha256 = "1h2rzh6x1zfr7j7f5cfai373qdnjf65gkdq5kklw5w0vn8jgm3gk";

 downloadToTemp = true;

 recursiveHash = true;

 preferLocalBuild = true;

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

index e4a2bfb1c55dd386a39a357d50008e3495943b79..f04d0d6a3e3a5d8a93f6387489dec6d9699c5454 100644

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

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

@@ -2,7 +2,7 @@ { stdenv, fetchurl, unzip }:

stdenv.mkDerivation rec {

pname = "opentopomap";

• version = "2020-04-10";

• version = "2020-05-15";

src = fetchurl {

 url = "http://garmin.opentopomap.org/data/russia-european-part/russia-european-part_garmin.zip";