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

index 122df268bb292e883ed21a5842fdf7b519a89bac..4f19ddfc52fff8e84b4e8ec540602100fc035795 100644

--- a/nix/sources.json

+++ b/nix/sources.json

@@ -19,10 +19,10 @@ "description": "Cheetah3 is a free (MIT) and open source template engine for Python.",

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

     "owner": "CheetahTemplate3",

     "repo": "cheetah3",

•    "rev": "44ebf7f59a749322fcc397b21611ad487193e697",
  

•    "sha256": "1962imkj6w54h5c46jnxx79lpc7dw5a731p38j8z4630hwzli1dw",
  

•    "rev": "7f4ab7d20c7b052c6f240fc146e04b7d6d5b7d63",
  

•    "sha256": "03lxxsy53a5bmbnmf11ndbdvrb58lccj531lvsqjm0li9f0s63xk",
  

     "type": "tarball",

•    "url": "https://github.com/CheetahTemplate3/cheetah3/archive/44ebf7f59a749322fcc397b21611ad487193e697.tar.gz",
  

•    "url": "https://github.com/CheetahTemplate3/cheetah3/archive/7f4ab7d20c7b052c6f240fc146e04b7d6d5b7d63.tar.gz",
  

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

 },

 "csvquote": {

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

 },

 "geofabrik-estonia": {

     "builtin": false,

•    "sha256": "1ivrsnjax92azf3n94xm7shjpfp36m8rfni728v4idw1zjlklgz1",
  

•    "sha256": "1r7f8q4par0jnnfc0v7y0a2zp7xv27lgjwanm99x81ipcncrhq34",
  

     "type": "file",

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

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

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

•    "version": "200402"
  

•    "version": "200403"
  

 },

 "geofabrik-finland": {

     "builtin": false,

•    "sha256": "0mi5dl154xgpx5x4n1xr7f5q3wv5kc0ggz6gskmd8rvinzwwfasq",
  

•    "sha256": "1bflaszvzr296mcgq4g9l029x3xxqzgfaab7ydyjn12z6a2paylb",
  

     "type": "file",

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

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

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

•    "version": "200402"
  

•    "version": "200403"
  

 },

 "geofabrik-russia-nwfd": {

     "builtin": false,

•    "sha256": "0f6qmh91rddwv4p53j95hrvdxvk8964kc7358y56gacph7c7h8z9",
  

•    "sha256": "047gsrnz3qjhkpc2qksjxs9px3hkahyi0sgmwi0aai9j0692fx4i",
  

     "type": "file",

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

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

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

•    "version": "200402"
  

•    "version": "200403"
  

 },

 "gimgtools": {

     "branch": "master",

@@ -147,10 +147,10 @@ "description": "Add Google translate to GoldenDict",

     "homepage": "https://github.com/xinebf/google-translate-for-goldendict",

     "owner": "xinebf",

     "repo": "google-translate-for-goldendict",

•    "rev": "d8a271ed5f8b9db6c7504f5ebcc0a0bd0380b0c8",
  

•    "sha256": "1wmxyak6b86657wavfxi33m3l60v10r8n26fjv6z47krk7a318a1",
  

•    "rev": "3f0a896176cb0b4544811168560e569273435c03",
  

•    "sha256": "0iin4f1vqiixywwd42yy4mzhcyqp7yz88diic2281a04yxcgc647",
  

     "type": "tarball",

•    "url": "https://github.com/xinebf/google-translate-for-goldendict/archive/d8a271ed5f8b9db6c7504f5ebcc0a0bd0380b0c8.tar.gz",
  

•    "url": "https://github.com/xinebf/google-translate-for-goldendict/archive/3f0a896176cb0b4544811168560e569273435c03.tar.gz",
  

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

 },

 "gpx-layer": {

@@ -225,10 +225,10 @@ "description": "A collection of c++ tools for using GPX files ",

     "homepage": "https://notabug.org/irdvo/gpxtools",

     "owner": "irdvo",

     "repo": "gpxtools",

•    "rev": "b989f357abb9f9b694cbe95081dd8d1094019233",
  

•    "sha256": "0zqdfv8qh6k5am17xnzhpki2rlvf5vpfjdpxazgli3pzbv2i6dbn",
  

•    "rev": "f7d289ab9f42e492e6db800a073f4464db24dd56",
  

•    "sha256": "15smkw2izqml4y9knyi0ywnn7805v13gbdz09r9ygqk5z50xsv7b",
  

     "type": "tarball",

•    "url": "https://notabug.org/irdvo/gpxtools/archive/b989f357abb9f9b694cbe95081dd8d1094019233.tar.gz",
  

•    "url": "https://notabug.org/irdvo/gpxtools/archive/f7d289ab9f42e492e6db800a073f4464db24dd56.tar.gz",
  

     "url_template": "https://notabug.org/<owner>/<repo>/archive/<rev>.tar.gz"

 },

 "gt-bash-client": {

@@ -251,10 +251,10 @@ "description": "A library of shell functions",

     "homepage": "https://github.com/legionus/libshell",

     "owner": "legionus",

     "repo": "libshell",

•    "rev": "b05a238290160d67c4253208b9c9523643c7471a",
  

•    "sha256": "0xdg1xnkwi70c0q5aw288zr51b1iwvbnjxm0ld1j0smaza7xndad",
  

•    "rev": "62559f85214bb902c2201d0a1e338d56d5f640e4",
  

•    "sha256": "1iyqagc8mc0afp0clbigjqds1hg3wz884cp1nng7gx08rnmr0l89",
  

     "type": "tarball",

•    "url": "https://github.com/legionus/libshell/archive/b05a238290160d67c4253208b9c9523643c7471a.tar.gz",
  

•    "url": "https://github.com/legionus/libshell/archive/62559f85214bb902c2201d0a1e338d56d5f640e4.tar.gz",
  

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

 },

 "lsdreader": {

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

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

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

     "region": "szfo",

•    "sha256": "0r25rh9l5g248jwjd2kjx3zcs1v51lwmz0jzydwnng94sxr7ya7f",
  

•    "sha256": "01y1cdpj0vcd33ic6964x0fhzcp330h1ni10qli97ahk3lmai0xh",
  

     "type": "file",

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

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

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

•    "version": "2020-04-03"
  

•    "version": "2020-04-04"
  

 },

 "mbtileserver": {

     "branch": "master",

@@ -340,10 +340,10 @@ "description": "Basic Go server for mbtiles",

     "homepage": "https://github.com/consbio/mbtileserver",

     "owner": "consbio",

     "repo": "mbtileserver",

•    "rev": "1473ef44549e2664bce607595f60afe230389aad",
  

•    "sha256": "17wh7jywdglh4wfqsiyaqcbsnfzalgq9x3yladypzjmh1cgdb2f4",
  

•    "rev": "f2305b518fa81a9d7a3695abc0e4131401a936e6",
  

•    "sha256": "0b0982rn5jsv8zxfkrcmhys764nim6136hafc8ccj0mwdyvwafxd",
  

     "type": "tarball",

•    "url": "https://github.com/consbio/mbtileserver/archive/1473ef44549e2664bce607595f60afe230389aad.tar.gz",
  

•    "url": "https://github.com/consbio/mbtileserver/archive/f2305b518fa81a9d7a3695abc0e4131401a936e6.tar.gz",
  

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

 },

 "mercantile": {

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

index 9b19a6abe55be99f84a3118dafd04b3623d3a432..45779810009bdf07384e8c1e1f3302cd4562e634 100644

--- a/pkgs/data/maps/qmapshack-routinodb/default.nix

+++ b/pkgs/data/maps/qmapshack-routinodb/default.nix

@@ -2,7 +2,7 @@ { stdenv, sources, routino }:

stdenv.mkDerivation rec {

pname = "qmapshack-routinodb";

• version = "2020-04-02";

• version = "2020-04-03";

srcs = [

 sources.geofabrik-finland

 sources.geofabrik-estonia