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

index 41a47067f927a2e5dabdf67dad792b3630fb6b3e..04217ca4006b6da26f43c05f1e96fe06744e559a 100644

--- a/flake.lock

+++ b/flake.lock

@@ -1,12 +1,15 @@

{

"nodes": {

 "flake-utils": {

•  "inputs": {
  

•    "systems": "systems"
  

•  },
  

   "locked": {

•    "lastModified": 1680776469,
  

•    "narHash": "sha256-3CXUDK/3q/kieWtdsYpDOBJw3Gw4Af6x+2EiSnIkNQw=",
  

•    "lastModified": 1681037374,
  

•    "narHash": "sha256-XL6X3VGbEFJZDUouv2xpKg2Aljzu/etPLv5e1FPt1q0=",
  

     "owner": "numtide",

     "repo": "flake-utils",

•    "rev": "411e8764155aa9354dbcd6d5faaeb97e9e3dce24",
  

•    "rev": "033b9f258ca96a10e543d4442071f614dc3f8412",
  

     "type": "github"

   },

   "original": {

@@ -17,11 +20,11 @@ }

 },

 "nixpkgs": {

   "locked": {

•    "lastModified": 1680728981,
  

•    "narHash": "sha256-ZhsViPJJvET7iLyD9ey63q6GwPKquDqIbOn2letvb/A=",
  

•    "lastModified": 1681002951,
  

•    "narHash": "sha256-nD9fXN7EVKGovtjrXIuA7Si9M6PD9b02GNtvQPTSuOk=",
  

     "owner": "nixos",

     "repo": "nixpkgs",

•    "rev": "38263d02cf3a22e011e137b8f67cdf8419f28015",
  

•    "rev": "431bf1e6cdd494e5230fbb72884afb4ca612c578",
  

     "type": "github"

   },

   "original": {

@@ -35,6 +38,21 @@ "root": {

   "inputs": {

     "flake-utils": "flake-utils",

     "nixpkgs": "nixpkgs"

•  }
  

• },

• "systems": {

•  "locked": {
  

•    "lastModified": 1681028828,
  

•    "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
  

•    "owner": "nix-systems",
  

•    "repo": "default",
  

•    "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
  

•    "type": "github"
  

•  },
  

•  "original": {
  

•    "owner": "nix-systems",
  

•    "repo": "default",
  

•    "type": "github"
  

   }

 }

},

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

index 54a967f633c86dac00ec9a410fa4f2a8d96e650c..8902fbfe845602bdd4917d64ad4f69975c6987a8 100644

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

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

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

in

stdenvNoCC.mkDerivation rec {

pname = "tatoeba";

• version = "2023-04-01";

• version = "2023-04-08";

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 8cbd22ba034d573c976fc28dec0afa4712c296b9..2611c3537db5996da59aa1c6eb02a4ff6a3360c5 100644

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

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

@@ -1,55 +1,55 @@

{

"deu_sentences_detailed": {

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

• "hash": "sha256-qbYuA7oUS9tLb7k/VstDof/6nygR3KTxX9SVtI2DdRs="

• "hash": "sha256-rvKXkfK4TdBQ4uCf+/sokzqKlCe94phKbprDjpbqBJg="

},

"eng_sentences_detailed": {

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

• "hash": "sha256-cBO9F4DG+yVJ5vi5kE1uPsO1BOlItoLi5hUZH6DOL9U="

• "hash": "sha256-M6DuDFXbu5ilm/SA37EpkIv6kHTmkBfMrSre0ffm+nA="

},

"epo_sentences_detailed": {

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

• "hash": "sha256-xTThyaJwdHD6AxbAI29fgAhewUosSLGEAPmOXiPUfd0="

• "hash": "sha256-nMrxElU9DtpS9JxMvcBCZlloAtIOIVuhPnYaIbPsVz0="

},

"fin_sentences_detailed": {

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

• "hash": "sha256-2UvXlL0dCmfCNyWI+zTFBfbSF1iUCdYpiZHtxJ60Qus="

• "hash": "sha256-fhpruGyHvkRWwIv6k3l2qcA8WLqS2JyJnnyAuBj9E5Y="

},

"hye_sentences_detailed": {

 "url": "https://downloads.tatoeba.org/exports/per_language/hye/hye_sentences_detailed.tsv.bz2",

• "hash": "sha256-fy3nigZ0lFm8S7tTFG1C62sM24ARUK3rADqe4WwRaPs="

• "hash": "sha256-BfcibryV0Q4/h+/Oie4201/mv681VjcBtb67LiA5Zig="

},

"rus_sentences_detailed": {

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

• "hash": "sha256-mVuWwbIKQ5B6VA67t4g5nXvhJI2r3cOfuVxQ9LjEzuY="

• "hash": "sha256-RUolxcrNzsj8ImYEEvlMOsdHpKJvqNWK5eaYM+CEFic="

},

"swe_sentences_detailed": {

 "url": "https://downloads.tatoeba.org/exports/per_language/swe/swe_sentences_detailed.tsv.bz2",

• "hash": "sha256-91N14j+dxNEqtCxsiJYLa3ucddw5I6qhbY5TbrvEwG0="

• "hash": "sha256-ghrgXJ6ViWIj7ri2iDsFf+kzB/U9XrWWDqM05mQF99s="

},

"ukr_sentences_detailed": {

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

• "hash": "sha256-AOrNvcJHkcOPc1JMMhOgFjgYlh5WiZvD90LMo3IJmC4="

• "hash": "sha256-i2eo3oAWEcTbguPkN2/kWkEzf7Uu+UgkWROt1PAQJpU="

},

"deu-eng_links": {

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

• "hash": "sha256-v1KowPUtiGoFuSLPh2iY9mwokR+Acj7zyIhhvdHAwDM="

• "hash": "sha256-ivzWiT+KJsZU1YXowMtfTtV8kEWAslDW7YiT7TBsMcc="

},

"deu-rus_links": {

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

• "hash": "sha256-ukBZ7a2ty9lj7S1BXmX69e3l8vYaEhed60chjyNAXaI="

• "hash": "sha256-qulVTWssYkxKznfS9/0lLxIJjGf/G9Ew9BTDdtpI3P8="

},

"eng-epo_links": {

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

• "hash": "sha256-wirahdCXD3tenBh1b7UuH59esCffSIaQqQp93o1HUys="

• "hash": "sha256-vvO++OML5Dux5j0QrQApPrUxul04wXAEPLuRsM1bB6M="

},

"eng-deu_links": {

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

• "hash": "sha256-F5/Hhzsiy5HNqFd9EtoNU3kE615rRlzbUVlnmopmPQc="

• "hash": "sha256-XM072q/DYo/9AfhkZyAV3Cy2Jpo8PRhwh83zSYbTWMo="

},

"eng-fin_links": {

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

• "hash": "sha256-0++ISIp/NTCspYR70MRirFV+hf9Tk0T4OGKye/59PcM="

• "hash": "sha256-jXLTKTufA4nDSJNOcV1RVQHVIlUxhN98BVET/GQnTHc="

},

"eng-hye_links": {

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

@@ -57,31 +57,31 @@ "hash": "sha256-OrRH40TkAzq8xCHAfy4aE8h3QIXzzGim1PnPVN5lYSw="

},

"eng-rus_links": {

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

• "hash": "sha256-U2gXsSW0qRDYXqwPRflfRAkQow76OYNEioNqf1c9Vbs="

• "hash": "sha256-ezPzlgH2e3mCENSguFHots+LH3gEcjKcRZiiKliQ1NE="

},

"eng-swe_links": {

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

• "hash": "sha256-Sl3tHyvnxa5odV35grHwRb/1xQcqxhX7y6Wn5f6TtkI="

• "hash": "sha256-QR1GqksGOcQrS7hfgrbkw0mzyVnzV14ss9aR0LvDFco="

},

"eng-ukr_links": {

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

• "hash": "sha256-naH3pBr6UiyibngLcR+4aOC/Fuea9AVw/yBfPZcHY3Y="

• "hash": "sha256-VLQ8wDIdt9RW5kFHxAftno2jQlOwDyKrXMlgMoXvMeE="

},

"epo-eng_links": {

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

• "hash": "sha256-khC54ySdn1r8yFQyFP0Gic0KZTsaVKZ8rOAkrrKgYgA="

• "hash": "sha256-OdEjL+rEX2jLstcXBDslhczQeiQyKdekNSgZNQc1llQ="

},

"epo-rus_links": {

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

• "hash": "sha256-4/xBTtk/dFTKbvHFwLSpiH50DA4s/mfyu3uLiSq5WdM="

• "hash": "sha256-PB4rN1hqTr17PJCoyMNGpMhOQ+qhn0NakBV2ZeTgAWQ="

},

"fin-eng_links": {

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

• "hash": "sha256-oJtPsvcRkTo8LfvUj/NIoDbb9m84/5Z7bNtFg/cJbGU="

• "hash": "sha256-0cDlXJNO2B7SK+76sKgVaW4T0SyDqd/5H9cQPgEHknc="

},

"fin-rus_links": {

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

• "hash": "sha256-bPwLwMiKCJet5ZaoiB9WC3uYw/uBTLFahk3od56jzl8="

• "hash": "sha256-uhG9u5Gr6yLCdrI+fQlBOQw7xad1HOk+pZal3cmBbuM="

},

"hye-eng_links": {

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

@@ -89,50 +89,50 @@ "hash": "sha256-jy+AikMbf2EOiy7fsa/pGXINjNb8A8DqoxbATtrNzl8="

},

"hye-rus_links": {

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

• "hash": "sha256-oSDdLfnS7719T2l1Bdx8BPFOMHA+lmArwMrf+3RXjNQ="

• "hash": "sha256-gyGczyxeyix9Doa2n7LzYnN7QjuGuG3zTI9ahvKkIsE="

},

"rus-deu_links": {

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

• "hash": "sha256-7WxLWRenNdKNqcvWLu4Wy9Kp6dYjmy7GW5PU0Oq1pkU="

• "hash": "sha256-roogHdVcqnm3P1CT/ioQKBaBSz5khtQ16EslGOZAKNg="

},

"rus-eng_links": {

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

• "hash": "sha256-ozv1vP/0Lh2CJA8loquIt/S8Ff055MF4231047CoWs4="

• "hash": "sha256-5Ez5VJU1casxjH4LFU4vRR2KgQBtZQCd3iMyvU0V+Ys="

},

"rus-epo_links": {

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

• "hash": "sha256-GyUONN+6h4Pt2SETqErUdcs2vwoD2rto6oB/zwEy4uw="

• "hash": "sha256-FJHQ9/i6LAgEGOIrXkgAkJVWdX6SvtIxgq4AZ4inIKY="

},

"rus-fin_links": {

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

• "hash": "sha256-eYM4vBhee8ZUzuflZIKjxjwyrEn63nbgZPG0+XSOntg="

• "hash": "sha256-ujwtPe/+QvUTQvlQm6MDdj+bMJdey6u6L6GrwWhTc64="

},

"rus-hye_links": {

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

• "hash": "sha256-HrEHEg/ELSEGmD37i9JvsWmaGuoPJkNiOh097GBe7MM="

• "hash": "sha256-jkryaZ2YEJetfVaLm8WFg7g5aYxzcM8jAwr8iPxmFXg="

},

"rus-swe_links": {

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

• "hash": "sha256-8mpYgwr22sqBZQ5JiWIeHZAaaL/yu5qko8xm76kCJRE="

• "hash": "sha256-Ofz70X5+Ks2b/AyvSTlJEYwn0l8mgv8a7FuBXSEA26E="

},

"rus-ukr_links": {

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

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

• "hash": "sha256-sMvHqXLzpmSRX/m5x59SuFP4Hsv2Y/+E5mDYhwhLDYY="

},

"swe-eng_links": {

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

• "hash": "sha256-ce8IvKxB0eeRtPCwH4ghPjKI5yDYBl75oqsiajlPMm4="

• "hash": "sha256-xRg4BnHyARrTjtKuot59l+I0C7Qq+fDcnfhA/37vu7k="

},

"swe-rus_links": {

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

• "hash": "sha256-i4XEWRhg5IjTXvrNyhiD87dvxPYnEkara7Z4ZwsxsCc="

• "hash": "sha256-gEK9bmQBXQ0klazJRN0bYcHWTAKlMLbMw/urZGamECw="

},

"ukr-eng_links": {

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

• "hash": "sha256-5ppZ3nXZA+u1unqb2a8MA9AULmI81cln9u9M07pcnoY="

• "hash": "sha256-W09yg5D2ZxfOYhTaVqC5I+Y8BF3PxLTF+rExC68ayWg="

},

"ukr-rus_links": {

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

• "hash": "sha256-vFWZI5UTNfsYn8eCSRjX5sIE5dfBerFnC/k1QvqHX6g="

• "hash": "sha256-TVpEEPuVPjsEn81a32v5tm50hXCnuLhE2jkiWxxVeao="

}

}

diff --git a/pkgs/osm/osm-3s/default.nix b/pkgs/osm/osm-3s/default.nix

index bb2699597f296f640ff9fdf62b454db0734fb1fd..84be2d7728de3971108304d272ea6fc7399541b0 100644

--- a/pkgs/osm/osm-3s/default.nix

+++ b/pkgs/osm/osm-3s/default.nix

@@ -2,11 +2,11 @@ { lib, stdenv, fetchurl, expat, lz4, zlib }:

stdenv.mkDerivation (finalAttrs: {

pname = "osm-3s";

• version = "0.7.59.1";

• version = "0.7.59.5";

src = fetchurl {

 url = "http://dev.overpass-api.de/releases/osm-3s_v${finalAttrs.version}.tar.gz";

• hash = "sha256-8rGQjhsL3wbb1jr9VGG9eDuw7sXYxQY+Wmlsyfafjng=";

• hash = "sha256-ulH3eRzThfN3Z7W7Qah9lVWxAUYBctgXJREXIDxtbt0=";

};

buildInputs = [ expat lz4 zlib ];