diff --git a/flake.lock b/flake.lock

index fe0c9b9613906d6b2369e65fd0b8f817dfb4a8bd..1a57c4516ccff332978ee6ba8244f3487f36ca60 100644

--- a/flake.lock

+++ b/flake.lock

@@ -2,11 +2,11 @@ {

"nodes": {

 "nixpkgs": {

   "locked": {

•    "lastModified": 1632650849,
  

•    "narHash": "sha256-PYKC/aP409p4+Gnn0Ix7gFJncg1NwQgguwdTEyC8t+A=",
  

•    "lastModified": 1633329294,
  

•    "narHash": "sha256-0LpQLS4KMgxslMgmDHmxG/5twFlXDBW9z4Or1iOrCvU=",
  

     "owner": "NixOS",

     "repo": "nixpkgs",

•    "rev": "b5182c214fac1e6db9f28ed8a7cfc2d0c255c763",
  

•    "rev": "ee084c02040e864eeeb4cf4f8538d92f7c675671",
  

     "type": "github"

   },

   "original": {

diff --git a/pkgs/data/dicts/tatoeba/default.nix b/pkgs/data/dicts/tatoeba/default.nix

index 3ba452bc438fb636a30dc27728a70b7ab44f0320..907ddfff355f498953ca2cd7dc1040237dd3c50f 100644

--- a/pkgs/data/dicts/tatoeba/default.nix

+++ b/pkgs/data/dicts/tatoeba/default.nix

@@ -24,7 +24,7 @@ tatoeba = builtins.fromJSON (builtins.readFile ./tatoeba.json);

in

stdenvNoCC.mkDerivation rec {

pname = "tatoeba";

• version = "2021-09-18";

• version = "2021-10-02";

srcs = lib.mapAttrsToList (name: spec: fetchurl spec) tatoeba;

diff --git a/pkgs/data/dicts/tatoeba/tatoeba.json b/pkgs/data/dicts/tatoeba/tatoeba.json

index 2a2d1fb7927a00a0db0494f89e0567fbfff20503..ac4f45a63ea6aea75064e5cd440bbe4ec0496ad0 100644

--- a/pkgs/data/dicts/tatoeba/tatoeba.json

+++ b/pkgs/data/dicts/tatoeba/tatoeba.json

@@ -1,67 +1,67 @@

{

"deu_sentences_detailed": {

 "url": "https://downloads.tatoeba.org/exports/per_language/deu/deu_sentences_detailed.tsv.bz2",

• "hash": "sha256-laWojCo3Ieds1aBVYwP+xQ1PdJfX5ml4OlRQsFEwHak="

• "hash": "sha256-gE7EjLoDq7BTAdhu2/mNLtADhoAjstFRLFoUVL8prHg="

},

"eng_sentences_detailed": {

 "url": "https://downloads.tatoeba.org/exports/per_language/eng/eng_sentences_detailed.tsv.bz2",

• "hash": "sha256-H/8fjifpkYR8OUWkHbL+sN7l6W7bQBrTvhSHJuSgRFk="

• "hash": "sha256-K5wHrlfOXxPVMwKKLYj6I54vWe9aHRzWUKVZHqq2MBE="

},

"epo_sentences_detailed": {

 "url": "https://downloads.tatoeba.org/exports/per_language/epo/epo_sentences_detailed.tsv.bz2",

• "hash": "sha256-yJOtGxbfR5ejSMbJIEqmKohbUJ2XJUDJ20ZuHninndM="

• "hash": "sha256-MxPoksoHfLo2wMRgalP6HjdhuXRVYkLF5KcyhktDorE="

},

"fin_sentences_detailed": {

 "url": "https://downloads.tatoeba.org/exports/per_language/fin/fin_sentences_detailed.tsv.bz2",

• "hash": "sha256-xDtOzfDVp1GcKM3z3uBKshDdlFGrwJ3tzSEefhAiuls="

• "hash": "sha256-NuPHwKzPZfc+aG01kNV5ON6s+3A81RnfnuFbxJbuvcw="

},

"rus_sentences_detailed": {

 "url": "https://downloads.tatoeba.org/exports/per_language/rus/rus_sentences_detailed.tsv.bz2",

• "hash": "sha256-TlDAOuxKwHc1PPTKApkef0+AyAYgjgGfmn6zmCjX0LY="

• "hash": "sha256-ueoJ4/TZ5Z7wMZxbRM+lPOV9/h28UXquAuOQfQ5F2+4="

},

"ukr_sentences_detailed": {

 "url": "https://downloads.tatoeba.org/exports/per_language/ukr/ukr_sentences_detailed.tsv.bz2",

• "hash": "sha256-qON/+e7F9WNG7bgkKmSrbL+9BDEyVfBEiIsOyrelzBg="

• "hash": "sha256-QWQSgIWPsCp5WHU/yA9vBAqcDgsfnNEdUgVbYeX2wxY="

},

"deu-eng_links": {

 "url": "https://downloads.tatoeba.org/exports/per_language/deu/deu-eng_links.tsv.bz2",

• "hash": "sha256-uqOA9BdCc2FiPuSAQR1azdnwx1oeoLNNbgjtCHD9I3Y="

• "hash": "sha256-bbDxyd5cevxbql01S/nGxK8a0FU7HELe7weTrwMrH88="

},

"deu-rus_links": {

 "url": "https://downloads.tatoeba.org/exports/per_language/deu/deu-rus_links.tsv.bz2",

• "hash": "sha256-hOpn8mGbokkaJDcwePtXxkPsEyYbc2WliEoprNeMKhA="

• "hash": "sha256-DgY9aX3vnMacCYvM/t75UR78xo77Zxo5FuNLxl16EQI="

},

"eng-epo_links": {

 "url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-epo_links.tsv.bz2",

• "hash": "sha256-PRWfwYscDE616mSbmhWzuvNRTCu7Rsmy48FdkE3p+S4="

• "hash": "sha256-MfwVCgIKr++Cp00ftmSUnK7fgQK2ojmPOz69a/mI6Bg="

},

"eng-deu_links": {

 "url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-deu_links.tsv.bz2",

• "hash": "sha256-1uMnoCc70s/WdOdGaVfGcWmMCbGuZ2Q0/IcZgvqyiL4="

• "hash": "sha256-ADDPggu1bfDae0bu86PtnUr19pRk5KSdwBjbOUBIHfM="

},

"eng-fin_links": {

 "url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-fin_links.tsv.bz2",

• "hash": "sha256-vB/yoYinVOXTL/YzZ+Ix+xCKxymtf3/MfaZbr2C+4u8="

• "hash": "sha256-Yn9gxc74PEmyZysHK/qMRyLGB2QQlXTFMJ8jhLXoD+c="

},

"eng-rus_links": {

 "url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-rus_links.tsv.bz2",

• "hash": "sha256-XOpXgrsMC2zaRJFMnQh2jAUpi4W+zFN8its1qrNdhI0="

• "hash": "sha256-0POD+BfslPOg3eKQSPlPrhMeS6TxYzWpYwV7gpVv9tE="

},

"eng-ukr_links": {

 "url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-ukr_links.tsv.bz2",

• "hash": "sha256-qSRLZot2vw1uxcr3aGTRdWOeKaPZg6iUuOPhGQEwcX8="

• "hash": "sha256-ck2bf45itM+K/nQbo7L2NOjyNsupWeGqJNShIRouSaM="

},

"epo-eng_links": {

 "url": "https://downloads.tatoeba.org/exports/per_language/epo/epo-eng_links.tsv.bz2",

• "hash": "sha256-dtASndUZA7OeNOiIjuJUeP+tJ9cLl7dNDcFeHUcfSQY="

• "hash": "sha256-VFt38One2FpH/XFwTl97dlXHCMQ+pnWg5k7DgOwasK4="

},

"epo-rus_links": {

 "url": "https://downloads.tatoeba.org/exports/per_language/epo/epo-rus_links.tsv.bz2",

• "hash": "sha256-CeJSvOE4pEEORONOB5S7kuZPjQQd/83xEjwRLjMtiYU="

• "hash": "sha256-e3STWQudHbEo2BSnEgIsUIUuMmCgkVzJPdAAldTIFAI="

},

"fin-eng_links": {

 "url": "https://downloads.tatoeba.org/exports/per_language/fin/fin-eng_links.tsv.bz2",

• "hash": "sha256-9tbUJgswgstU31t1FOv1Hi7y2Y64U5BCBwH12D1fnFo="

• "hash": "sha256-+jo3TpKFW9Sx2hxvc1HD2vnGa4ArkrQbmdVJDZllckU="

},

"fin-rus_links": {

 "url": "https://downloads.tatoeba.org/exports/per_language/fin/fin-rus_links.tsv.bz2",

@@ -69,15 +69,15 @@ "hash": "sha256-epl1FdjToSd8aC6j1rzYiavPj9YWcMDWr/lv5L8rbaE="

},

"rus-deu_links": {

 "url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-deu_links.tsv.bz2",

• "hash": "sha256-eimoVqdSnFx1d1jI4FEDPt4FQ9vkSws3BTDsg46Gv1M="

• "hash": "sha256-Tfd/1NewzS6A+sPgopplXCFP2e6l6Ns2GyffAVaViAo="

},

"rus-eng_links": {

 "url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-eng_links.tsv.bz2",

• "hash": "sha256-kCoZPIP9JdoW2L7poVoNUQJMQ+TCxDUDtL2IzKTruEI="

• "hash": "sha256-YbK7d6nY4e7g7CYo0BYZWsuPX4qPB6mbyiGxg4Z16UY="

},

"rus-epo_links": {

 "url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-epo_links.tsv.bz2",

• "hash": "sha256-XHWvIAjp03XWP8Sp7r6acCC7bz8COu53L6jIX/5uxEM="

• "hash": "sha256-AvQ22qKjDlptLRxJ2Whk+pJD193yCsFuZFOgQiHZcOE="

},

"rus-fin_links": {

 "url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-fin_links.tsv.bz2",

@@ -85,14 +85,14 @@ "hash": "sha256-sdENtQSzkdoioMPzpeCR+67QQ4KiJQof82aUqU/GA8E="

},

"rus-ukr_links": {

 "url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-ukr_links.tsv.bz2",

• "hash": "sha256-cx3nT57qtLwFMHrWHXgIXIhRX3RMy2wAAILKx0Y9f7g="

• "hash": "sha256-1TXeyhoU1l5djmmUcPUe4eRhXxgmhlSmaYDumv7hZ/A="

},

"ukr-eng_links": {

 "url": "https://downloads.tatoeba.org/exports/per_language/ukr/ukr-eng_links.tsv.bz2",

• "hash": "sha256-q7UnQFmkvxYdDX5H4xr9WZfTBI0A5Y4SXn5zT7eDLGU="

• "hash": "sha256-bGbyxpkmkI/J+yrQaLapq8V0XLfoixXpNibZMRoNUzY="

},

"ukr-rus_links": {

 "url": "https://downloads.tatoeba.org/exports/per_language/ukr/ukr-rus_links.tsv.bz2",

• "hash": "sha256-dGeZnUAfxB1+vpSyrzNvhtmqiOH4Kku8jbnnwMGzpio="

• "hash": "sha256-e+G+/kv7mqdgsaTjVuUzx0H5gNyNc4F+Hy3KdvSMEks="

}

}

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

index 96f40947a0a5ecb79d70ec2fd293b1e1e8cf8ac9..832fb922722343a19d6313710684ec9347c88c2d 100644

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

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

@@ -2,11 +2,11 @@ { lib, stdenvNoCC, fetchurl, unzip }:

stdenvNoCC.mkDerivation rec {

pname = "maptourist";

• version = "2021-10-01";

• version = "2021-10-04";

src = fetchurl {

 url = "https://maptourist.org/osm-garmin/archive/OSM-MapTourist-szfo-RU_${version}.zip";

• hash = "sha256-i3p7VGj1nM7R+uCIkR+4wu4hRiZc9+D+m1Wr4LbxyUY=";

• hash = "sha256-oLjD/3gxHh7sRw2DCa1CJXHwB6QNZPxjSZw/TedbiDQ=";

};

sourceRoot = ".";

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

index 3ffeb53ecea0c037c4f0d306894004b31afbdcef..fdf3f6586962d61d31a40ab041846ae013d6c0bf 100644

--- a/pkgs/data/misc/routinodb/default.nix

+++ b/pkgs/data/misc/routinodb/default.nix

@@ -2,20 +2,20 @@ { lib, stdenv, fetchurl, routino }:

stdenv.mkDerivation rec {

pname = "routinodb";

• version = "211001";

• version = "211004";

srcs = [

 (fetchurl {

   url = "https://download.geofabrik.de/europe/finland-${version}.osm.pbf";

•  hash = "sha256-7VSARH9l/gqI8Z6MdpR5fI6aUe82TNXpxf5WgxbvruI=";
  

•  hash = "sha256-vA/Vu7Sy9b7MZLW2DtrzVe+sRQ0Acc/YGleLbaDqSEs=";
  

 })

 (fetchurl {

   url = "https://download.geofabrik.de/europe/estonia-${version}.osm.pbf";

•  hash = "sha256-6TqVk7nMdtGOVmGEh70x5MyZdoOmC3sAB0jIjYpskdI=";
  

•  hash = "sha256-TaY3uYywnW7JifzA0fMyONaUbfF8H/KPuQrkfGqCt3g=";
  

 })

 (fetchurl {

   url = "https://download.geofabrik.de/russia/northwestern-fed-district-${version}.osm.pbf";

•  hash = "sha256-BK0T5GHNHVqeTrfdDf1jUDGCSNtgWhxDURQsiDIwoIo=";
  

•  hash = "sha256-2eEKO3tiX9G063Pma5JgJ2KWXNkxumYQS33nd3i3OG0=";
  

 })

];

diff --git a/pkgs/osm/map-machine/default.nix b/pkgs/osm/map-machine/default.nix

index 9a1f80e302d90951e419806df69baa48dc8d4ccd..b72f248338e0c3c5058e765a9d15b4aeb43ba887 100644

--- a/pkgs/osm/map-machine/default.nix

+++ b/pkgs/osm/map-machine/default.nix

@@ -2,14 +2,14 @@ { lib, fetchFromGitHub, python3Packages, portolan }:

python3Packages.buildPythonApplication rec {

pname = "map-machine";

• version = "2021-09-28";

• version = "2021-10-05";

disabled = python3Packages.pythonOlder "3.9";

src = fetchFromGitHub {

 owner = "enzet";

 repo = pname;

• rev = "eacb6c8ee1bb2f1f22591593e54711733c8f943a";

• hash = "sha256-FFqphxNVIfR6RBiXa7/uMKWrVuZQcc9MrzQy4RWE814=";

• rev = "245c316997888f26addecd6576f5bc85b4538fe4";

• hash = "sha256-fpBuYhqLZKZ6kwF6oSeMB03qcf3P+7LRhg58BC16L40=";

};

propagatedBuildInputs = with python3Packages; [