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

index 20a79fe21b363cef17ece2283f9765a8ec455b41..efd85d5581da149a9c8a98edb66154382e52162b 100644

--- a/flake.lock

+++ b/flake.lock

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

"nodes": {

 "nixpkgs": {

   "locked": {

•    "lastModified": 1629169812,
  

•    "narHash": "sha256-krVVUNxRjSBJaFWKelNe0MWvxhklXSGKmisoJP4P5/Q=",
  

•    "lastModified": 1630500761,
  

•    "narHash": "sha256-xjEjZro342lUPd5Z/fFwdAX1dMXXZ3tvPGqMpqs0U20=",
  

     "owner": "NixOS",

     "repo": "nixpkgs",

•    "rev": "70dc433f2eb84cc7ed848a30feaa5aab5890d23c",
  

•    "rev": "6cc260cfd60f094500b79e279069b499806bf6d8",
  

     "type": "github"

   },

   "original": {

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

index 280fda81c6719b37b901064ab7a01dbc4226a36e..aa968386c364ff15b7106773c3d1450e032ea99e 100644

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

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

@@ -3,8 +3,13 @@

{

deu-eng = callPackage ./base.nix {

 lang = "deu-eng";

• version = "0.3.5";

• hash = "sha256-9dHEogR1uJtTm3xCVIxdZ8nNoNT2iee11viOQQZFxms=";

• version = "1.8.1-fd0.2.1";

• hash = "sha256-FJP9vrzz/A2PwFDBOTtFGMc5OoiK7KE6qnAnG/mnXMU=";

• };

• eng-rus = callPackage ./base.nix {

• lang = "eng-rus";

• version = "0.3.1";

• hash = "sha256-3rQUFUbCa8YLsP//rTieSfBr4iRqOhSUtWm9o7CU44c=";

};

epo-eng = callPackage ./base.nix {

 lang = "epo-eng";

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

index 922d0f002cd56b45246b8a1d18bf8939ad344f14..19e7fd4df237bb4a1c4fa44b64cc95617dea47f9 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-08-14";

• version = "2021-09-04";

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 a9e35f2fba4f924e88d76a595c8b27a79ef4de39..9580dc81b32bacfb80b6d7c66fda4dbbf1fd478f 100644

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

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

@@ -1,98 +1,98 @@

{

"deu_sentences_detailed": {

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

• "hash": "sha256-7tJDzgS6cqcOIicPtv+1lcdZqaSK6Zr4fWbhXmjhhHA="

• "hash": "sha256-g2/WxztO0Ni75i1MNpthSvy2F0ywwbfJUcQgttwNh+Q="

},

"eng_sentences_detailed": {

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

• "hash": "sha256-aKolsL8e447rIbmarDO63yixThG8OH+E2iPaeYglUFY="

• "hash": "sha256-NuLNf4NA9NBUBcRpE+/neZfYNs/s4dnWgJKC5ZsEGZo="

},

"epo_sentences_detailed": {

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

• "hash": "sha256-iXh/jOdsfIF6YgzXY72CLA4fpnlTfHqksQHN2f15low="

• "hash": "sha256-WA2Ua0oeUs4vYZcHhACEPX+dFPyHq0Pj+OEuv3QP08o="

},

"fin_sentences_detailed": {

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

• "hash": "sha256-OVuAbO6dW5MfNpA3fuzibbDJB6/JXodr1tOH3Fg8raM="

• "hash": "sha256-s00F591RRhn1X0g6MbMmdTvLKXrBaSuHaZjgX6sXg+w="

},

"rus_sentences_detailed": {

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

• "hash": "sha256-MUIpkqx2V5YaNfcsCuZsanGY3JFNtiwEqxVhwxf1uDw="

• "hash": "sha256-0hPbjI9Hrv3LfV3xdT2lL3fU/oEbhbW/7msoduNZ6vg="

},

"ukr_sentences_detailed": {

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

• "hash": "sha256-vUCxm/dPDGOXzmZD6l7n1VSeo75Ofv4OaHYCT6SvwB8="

• "hash": "sha256-Vy0TKUP6WF22CNOArm7E4qm+aFH2nUDNvJTjQIuf5S8="

},

"deu-eng_links": {

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

• "hash": "sha256-L1v/9B2gmsFIIr7Xys3eclW+drjxYmRcVQ7UsKUacNY="

• "hash": "sha256-5y9afKjet+ZFOD6k8BqZq5uo2dVPDmwFGsdoR3fghZM="

},

"deu-rus_links": {

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

• "hash": "sha256-T5f96Z3VkPBZmrtizvNbMaj83GyTpM5tv6+XmHwL/nY="

• "hash": "sha256-ciAfgQDlv+rY+99cNIqAzLaA5Czs8LqM3l6csy+BnNM="

},

"eng-epo_links": {

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

• "hash": "sha256-0DGMSTyYWYh4JSJtV9Nojy/P5J9XVjPwK3HogdK/6Sg="

• "hash": "sha256-F1vb+q64eFbhRwLSempFBefjweSCR4zDGJ524zTij+4="

},

"eng-deu_links": {

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

• "hash": "sha256-Ni6Elks/rtrQhum9TXJdi7zNfcgXv63GfqJ0zhbHnAU="

• "hash": "sha256-npaG/hDzjVCi1F9+WtpCkx5w8+KpdchdcZe4Vfivl7Y="

},

"eng-fin_links": {

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

• "hash": "sha256-GJzcRIGGoQCzOnHyCXui8JsvLd0P1mCK47iQFc+wgJU="

• "hash": "sha256-PHK3nTxIPdqNk73aAi971PtjFSXhrFt2kDni9hLE/L4="

},

"eng-rus_links": {

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

• "hash": "sha256-/N2ozVRua6yCH4IS9es7Vltx0FjUvLuiJNuLcTaAdsE="

• "hash": "sha256-kPPkvVZqSo1bjF/Y/DImWYz1FqNKMc2KzvBpr5ktHE0="

},

"eng-ukr_links": {

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

• "hash": "sha256-cwm72fnExuVa7VbuDhfjsW5hibDNiv6dQilOeVkdRLE="

• "hash": "sha256-fSSe10osmv4jyXDW8XE6kRxnPoMu+kJbhWi5TcsMVUw="

},

"epo-eng_links": {

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

• "hash": "sha256-ie3jolKSkW3FeJJr9dPT6Vsw8dJccxHt/bbk64ZH5TY="

• "hash": "sha256-tyhSTUZmZe20NGHIdiF6qSAE6dt3D6jgelATc/p/O3Q="

},

"epo-rus_links": {

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

• "hash": "sha256-HFHcTJJQLTwgzrIHFDEE45GT8SIEGH2GrDV2e5ovOT8="

• "hash": "sha256-SSmAPxWqvzWrzIru+X9WocncxNN5FE7i1JyQKg3RSLs="

},

"fin-eng_links": {

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

• "hash": "sha256-tdKv6sgEm5bV45WwAmEf1aO7KxzLvRj2XTj+ptotFy8="

• "hash": "sha256-/w1XhNPVf5cDURtZjXDdS9X6OKUUk5LEJOEquGGEJt8="

},

"fin-rus_links": {

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

• "hash": "sha256-lcw+jOJLic+7AwVkWssHN3jHCOYFSKWuiXI3qlFQWpo="

• "hash": "sha256-epl1FdjToSd8aC6j1rzYiavPj9YWcMDWr/lv5L8rbaE="

},

"rus-deu_links": {

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

• "hash": "sha256-zmH8uQaISZ/X9CpmswDmJgUlyLAOAGfZxShU5GThuC0="

• "hash": "sha256-tsI4dzTqX7haZFSte/WWsrSPBZi1sGixRrBvQgz52Zc="

},

"rus-eng_links": {

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

• "hash": "sha256-ABE1k9nO0sGJeR97vqJOpK4w/PcxXqM2T5XRmoS87JA="

• "hash": "sha256-X4gJyTYyOuSxVVba3V2uXWVJglZ1JxAnEW74nlFvGBM="

},

"rus-epo_links": {

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

• "hash": "sha256-vrQ507OWmmGe8yo459hetfmXLTnuunuLutGqi5aBxyw="

• "hash": "sha256-vgSDwmTpBm/fYmsq+vrNmLV3wCYSkehh/gIzHQubl20="

},

"rus-fin_links": {

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

• "hash": "sha256-v0cuv5AJsxejY4SRqL8Of6c8W0HfblT4cPm5JvlpfFU="

• "hash": "sha256-sdENtQSzkdoioMPzpeCR+67QQ4KiJQof82aUqU/GA8E="

},

"rus-ukr_links": {

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

• "hash": "sha256-z2Z5bf3BvyarUxmvVy5n5MeKULyj1q/F65XvGvq5LtM="

• "hash": "sha256-SEcXH3R1pv3KGvo4m+CJsJpeXPAIf7GaXY8pIuv7h8k="

},

"ukr-eng_links": {

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

• "hash": "sha256-E2CUgAo/HrUHPFI4+4IVAqvjRCSetOA7mQBKt/vCw7Y="

• "hash": "sha256-fgAZSBpRk86+sx+fxBvV6uuog9iUWPqBdubuyBVA5ek="

},

"ukr-rus_links": {

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

• "hash": "sha256-zFELJ2p2y2j4uB8JnQ8n00nInH8c450yOGdG/k1bnlI="

• "hash": "sha256-zHE2Wb85vwldnyd9lCJxe1Fa0G+lbQWOC1eLVDtRltY="

}

}

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

index 9d337339e7f9599f4473a87f74f428886f99af7f..e1026ddbb5b73b666695bae78f533b383d3b3666 100644

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

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

@@ -3,61 +3,61 @@

{

de-ru = callPackage ./base.nix {

 lang = "de-ru";

• version = "2021-04-30";

• hash = "sha256-uDDXd4lXf4VAsBMMcrf+zZrv8QexsU3M/CqzXGRmM9g=";

• version = "2021-09-03";

• hash = "sha256-XQAJzZ/tN/gWj50NW21CQbAX+vAt+X52XqXHMM9tDB4=";

};

en-ru = callPackage ./base.nix {

 lang = "en-ru";

• version = "2021-05-05";

• hash = "sha256-UkBWRkpnG02K+7YOHTCx6T0u7UKbmFnsZpZcbriaS5E=";

• version = "2021-09-01";

• hash = "sha256-JLfzochNxA9ALUL7J3QD5AQxEyq7Tnd3Prfc8HNoqr8=";

};

fi-ru = callPackage ./base.nix {

 lang = "fi-ru";

• version = "2021-05-03";

• hash = "sha256-GUZmuj+23OVMwQT1jXVg7VvY7r/ERGOLax1dTwCv+ho=";

• version = "2021-08-30";

• hash = "sha256-pZk1/5jb5Rgq/6VrpKIAQsRn0H/kR2n11A4m3aotOrI=";

};

ru-be = callPackage ./base.nix {

 lang = "ru-be";

• version = "2021-01-21";

• hash = "sha256-VAkuG2T+IXzLSqJEmJ/VgGCNdUjxBEg90ECUWLeq6EE=";

• version = "2021-08-21";

• hash = "sha256-wGRbD0s0GECqdxJtBlw+geQHSArT4oGjn9tWSPhRPSg=";

};

ru-de = callPackage ./base.nix {

 lang = "ru-de";

• version = "2021-01-21";

• hash = "sha256-UrJTBDC99xoGNvVqYyU9QUzUESIaAVI0Btbu3I6PYU8=";

• version = "2021-08-21";

• hash = "sha256-lf7vvMBEMoreljU+HVpLhCbjhC+lTRRV6Km7SdActbU=";

};

ru-en = callPackage ./base.nix {

 lang = "ru-en";

• version = "2021-01-21";

• hash = "sha256-Lip6ixKIO3xeu8ZXsWDkFAZONbjUp+LVI0bc3TnFxKQ=";

• version = "2021-08-21";

• hash = "sha256-xfOd0NRoQ2T3ygK92hfxtI7u56MNSqOtl8hxwm+032w=";

};

ru-eo = callPackage ./base.nix {

 lang = "ru-eo";

• version = "2021-01-21";

• hash = "sha256-NXWfv78JoR/K7Tkp7GdSS5OxVJspKbOixVTPzmAO2uQ=";

• version = "2021-08-21";

• hash = "sha256-G6fwC6KB018wlF8wlBEkXTMg5xl4kXM8WyTrTx8S8og=";

};

ru-fi = callPackage ./base.nix {

 lang = "ru-fi";

• version = "2021-01-21";

• hash = "sha256-BYW5I3WBbsjU4IupZDYjkMpAI5vDP27EC/yUvf0hirE=";

• version = "2021-08-21";

• hash = "sha256-udCgUNM11b7b4py6r+UGTU8j3KwQ6Sg1HPS++bnunLg=";

};

ru-sv = callPackage ./base.nix {

 lang = "ru-sv";

• version = "2021-01-21";

• hash = "sha256-AtKuseepJdW39yHuMAIksFroO6aWoqu+4fvDjb4pEO0=";

• version = "2021-08-21";

• hash = "sha256-iQwwQqyvg64RBannVVsrLFyS7/rUYobMBpm2zSNELv8=";

};

ru-uk = callPackage ./base.nix {

 lang = "ru-uk";

• version = "2021-01-21";

• hash = "sha256-pnHDgduoRcILJnegDcTpReXkIq8CDLw5nEX2H04pWvo=";

• version = "2021-08-21";

• hash = "sha256-uf9JakgRcZswuUHo9Gt6xM3p23KTxp78evRdk08BLrw=";

};

}

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

index f2b57db9c27b69d25770fe707c2433597961ad37..af17d2f0d7fd6af627fb18aa12cca81eb656270d 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-09-01";

• version = "2021-09-05";

src = fetchurl {

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

• hash = "sha256-7qZnmGwHUWWyJqYMgVSE6fZ1RVlTzUECkYSANabr0Gg=";

• hash = "sha256-76SlpZaw/KFRdn67eY7bsGEbnMjjSzRoiDRx67LcDOw=";

};

sourceRoot = ".";

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

index 43892bee4831ca7431cf2247c2d0f9b86de8f27f..89d3da8eb19256b334faaf189ec439c85c35a2ae 100644

--- a/pkgs/data/misc/osm-extracts/default.nix

+++ b/pkgs/data/misc/osm-extracts/default.nix

@@ -17,11 +17,11 @@ in

{

admin-boundaries = stdenv.mkDerivation rec {

 pname = "osm-admin-boundaries";

• version = "210901";

• version = "210905";

 src = fetchurl {

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

•  hash = "sha256-ccXoVKniDY8zvGugfXaMb8TgE+arwoYmyQLwFvlnlww=";
  

•  hash = "sha256-ZFVnt7AbMZZdUgiv3AHvH4v+qrwRPNjJ1xyw4NMJFaM=";
  

 };

 dontUnpack = true;

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

index 404ebb4eea7ed3c7c3ea39d0bb4e3a7ba3731bdd..bca141a47c58bece5e5d8196ebe9897a35d9297e 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 = "210816";

• version = "210905";

srcs = [

 (fetchurl {

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

•  hash = "sha256-9nfhxci9Y/XE9I+sRF8Hju6Yg8dLa7epOIwsZVjwazA=";
  

•  hash = "sha256-f7tD1coF+PQelYI4OqfQ0mS1yhGzgl/H84cF9wwNjkY=";
  

 })

 (fetchurl {

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

•  hash = "sha256-9LSE/vkGKFVtp8InXcXOqzactoUZsunC45iK+Ta18oI=";
  

•  hash = "sha256-i9LIojA2Zh8MwWKJa7967S832tT8joifmFwxiWZvW9o=";
  

 })

 (fetchurl {

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

•  hash = "sha256-quHCVQomVPvqskC5YEClJU5Zno9oLiYx6omW1SMmRWk=";
  

•  hash = "sha256-ZFVnt7AbMZZdUgiv3AHvH4v+qrwRPNjJ1xyw4NMJFaM=";
  

 })

];