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

index 901e475464476f0f6d77151496296f97b3d518ba..2e87d11b3a21b3f1395fd70637adf6cd1cb71d0b 100644

--- a/nix/sources.json

+++ b/nix/sources.json

@@ -6,10 +6,10 @@ "description": "A ncurses file manager written in C with vim like keybindings",

     "homepage": "https://github.com/mananapr/cfiles",

     "owner": "mananapr",

     "repo": "cfiles",

•    "rev": "ee3f001225764cf38161bafd463c30cf64249de4",
  

•    "sha256": "07skhabq6ddvm3gwxw8fzb4z7m2zghv3dd96z2ygxpfx8w6h7rpn",
  

•    "rev": "460c44e07bb3838ef9ff2db818fec83a93262e3c",
  

•    "sha256": "037in3ksdmfhkz0d3wwsblzdhn3h5x3yk2yangqkdisay0fjyfpc",
  

     "type": "tarball",

•    "url": "https://github.com/mananapr/cfiles/archive/ee3f001225764cf38161bafd463c30cf64249de4.tar.gz",
  

•    "url": "https://github.com/mananapr/cfiles/archive/460c44e07bb3838ef9ff2db818fec83a93262e3c.tar.gz",
  

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

 },

 "cheetah3": {

@@ -110,35 +110,35 @@ "description": "GEF - GDB Enhanced Features for exploit devs & reversers",

     "homepage": "http://gef.rtfd.io",

     "owner": "hugsy",

     "repo": "gef",

•    "rev": "0134a4711202f1b8e6004e903fbac8db58ac6f3f",
  

•    "sha256": "0wpilwqciqqxkzgi9qn43skkgsphrzlawxin9wx48sg6bkwwzjnc",
  

•    "rev": "70b2e3f1a661e4ad8773ce07c473153b7bdca45f",
  

•    "sha256": "1s4i5j95y6kpd8vp1rnkr6vdgazn2g2vs9rfsvdm9l8xpckiwhzx",
  

     "type": "tarball",

•    "url": "https://github.com/hugsy/gef/archive/0134a4711202f1b8e6004e903fbac8db58ac6f3f.tar.gz",
  

•    "url": "https://github.com/hugsy/gef/archive/70b2e3f1a661e4ad8773ce07c473153b7bdca45f.tar.gz",
  

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

 },

 "geofabrik-estonia": {

     "builtin": false,

•    "sha256": "0c4mmicydw0vvfip49rbv2j24plv529dhx9mkb4z7dx34ill2srf",
  

•    "sha256": "179ral6av3hvlylfpzsfcw4d7qmlpniclfviq6yxhvxm3jij9hik",
  

     "type": "file",

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

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

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

•    "version": "200523"
  

•    "version": "200531"
  

 },

 "geofabrik-finland": {

     "builtin": false,

•    "sha256": "0zijy619jqkx32c44chv396sc29najv8qa5m6s0b54771vi7dq4m",
  

•    "sha256": "118f6zw40ps30bmhj3aqmbbv300i2j3ipj357ayjnq5kvrgxmmq8",
  

     "type": "file",

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

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

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

•    "version": "200523"
  

•    "version": "200531"
  

 },

 "geofabrik-russia-nwfd": {

     "builtin": false,

•    "sha256": "1xyx5sp6h6r1p7xcqjaq6fdff9ys8wknp92fdhzf2ihx49hiflrj",
  

•    "sha256": "1ns03i1g156g6fav8mvrlqjfy1gnic0m4xfsk2ggqxm0fmz7557l",
  

     "type": "file",

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

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

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

•    "version": "200523"
  

•    "version": "200531"
  

 },

 "gimgtools": {

     "branch": "master",

@@ -212,10 +212,10 @@ "description": "GPS log file viewer and analyzer",

     "homepage": "https://www.gpxsee.org",

     "owner": "tumic0",

     "repo": "GPXSee",

•    "rev": "6f72d46d6c24a832a7ea897e509dd9aaaad31c1e",
  

•    "sha256": "10w9j9vd28asn0gpnq4qv9psy20jb7sqfg9s6lvaq251kzy83ysz",
  

•    "rev": "1fc4dbbb7378e3d4df5497119f433b1eb01bd013",
  

•    "sha256": "09i8wm0zrggpircsvi2jzza1jyxar03frj12hjib6z0cf301a55q",
  

     "type": "tarball",

•    "url": "https://github.com/tumic0/GPXSee/archive/6f72d46d6c24a832a7ea897e509dd9aaaad31c1e.tar.gz",
  

•    "url": "https://github.com/tumic0/GPXSee/archive/1fc4dbbb7378e3d4df5497119f433b1eb01bd013.tar.gz",
  

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

 },

 "gpxsee-maps": {

@@ -225,10 +225,10 @@ "description": "GPXSee maps",

     "homepage": "https://tumic0.github.io/GPXSee-maps",

     "owner": "tumic0",

     "repo": "GPXSee-maps",

•    "rev": "72b7d70abd9b7436e94705ecc0f7ffd4fd184053",
  

•    "sha256": "0549hg94flx9028yfkmw7y1ivkcmjsbzw1l91vx9jr29b1vdfcba",
  

•    "rev": "56d9887b1cf1057743fc9467dcb676b2c3f052ce",
  

•    "sha256": "0pa7lmkryf9dqpc6wfgsyx2cmawljq0b91glcfg69xjdg7dxv64c",
  

     "type": "tarball",

•    "url": "https://github.com/tumic0/GPXSee-maps/archive/72b7d70abd9b7436e94705ecc0f7ffd4fd184053.tar.gz",
  

•    "url": "https://github.com/tumic0/GPXSee-maps/archive/56d9887b1cf1057743fc9467dcb676b2c3f052ce.tar.gz",
  

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

 },

 "gpxtools": {

@@ -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": "64a329c83eecfe094e0ba4f4fa635728b352859c",
  

•    "sha256": "03bq18vm4r4iwbbpzglrf16kvad2rvzk8rm0mx962pdhk4cnrqh4",
  

•    "rev": "629b813d09593411c3938229e97a38161826e84b",
  

•    "sha256": "1zcjs34x0xc4b5g5iff55yn911gn6kahv4s7yyk97fd2cxbz1caw",
  

     "type": "tarball",

•    "url": "https://github.com/OpenOrienteering/mapper/archive/64a329c83eecfe094e0ba4f4fa635728b352859c.tar.gz",
  

•    "url": "https://github.com/OpenOrienteering/mapper/archive/629b813d09593411c3938229e97a38161826e84b.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": "05pmwg55b0njzm21djp4bnjnbq7kagh524bcs27vbw7gq45mfc1h",
  

•    "sha256": "0ah9xr0x1rzrm2sliw3w5svagvzqc9yk85c6zsk71kxv1vhqr6c7",
  

     "type": "file",

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

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

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

•    "version": "2020-05-28"
  

•    "version": "2020-06-01"
  

 },

 "mbtileserver": {

     "branch": "master",

@@ -415,10 +415,12 @@ "description": "n³ The missing terminal file manager for X",

     "homepage": "https://github.com/jarun/nnn",

     "owner": "jarun",

     "repo": "nnn",

•    "rev": "b6762e292ca4f7ddf73f5752b571d3e0f04adbbb",
  

•    "sha256": "1wy3ckssg1pnq9ys69nvm6b02vsiv84nhasq5cni5w07cfkdf934",
  

•    "rev": "0ebc6db163ea3873fd55fc8adf4236c05060315a",
  

•    "sha256": "0vyw6z0ssaisdqa0njyl1lg04m3mji0dvb062fnszcvrblycwlw8",
  

     "type": "tarball",

•    "url": "https://github.com/jarun/nnn/archive/b6762e292ca4f7ddf73f5752b571d3e0f04adbbb.tar.gz",
  

•    "url": "https://github.com/jarun/nnn/archive/0ebc6db163ea3873fd55fc8adf4236c05060315a.tar.gz",
  

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

• },

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

 },

 "openmtbmap_openvelomap_linux": {

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

index 17b745b30a39aa7ea06292f16bec37a8ad151b95..7fc0f2b5f312a42228cca7386926b9cb71f8a5ef 100644

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

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

@@ -4,7 +4,7 @@ {

geocachingSu = fetchurl {

 name = "geocaching_su-2020-05-20";

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

• sha256 = "1rxc1hbcd5kgrvs6kc9c2ipzm4kksg1yv8c4wgqp7rc0gp3ghjf6";

• sha256 = "0ff2r8lzysd51j5knvxknmqzqczk3ylv2n1a0dl3jr34wzld7rpv";

 downloadToTemp = true;

 recursiveHash = true;

 preferLocalBuild = true;

@@ -70,7 +70,7 @@

westra = fetchurl {

 name = "westra-2020-05-20";

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

• sha256 = "1q9lj0w259pizpz88jr0i36bvdxckmj8id9yfbh92xvzb31hc95x";

• sha256 = "0zssyw1zknqlb0klbx986l0q3848g3gm9l8sv0djrqapyi3jz93b";

 downloadToTemp = true;

 recursiveHash = true;

 preferLocalBuild = true;