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

index 85c06f3602a6ff46ece1ad0784da02c1262bc49a..e8fd1ad91f5b0c9e8855ed735a6f37e42fbf8c3c 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-08-05";

• version = "2023-08-12";

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 eac97dbb4c80380415889e974e89a0bfc06adb79..25dc9b498c6ebe28a0981e7dad90b93255bc9f57 100644

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

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

@@ -1,19 +1,19 @@

{

"deu_sentences_detailed": {

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

• "hash": "sha256-nWoLTV+pGXujP+B34bbJOwOjQYRyDheWwAZTxQJI0NI="

• "hash": "sha256-Geriwu1Og1GRIgroQcMM7/dpVjhbnEUM2RhQSWsLBfM="

},

"eng_sentences_detailed": {

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

• "hash": "sha256-KGROxk1nmOXHmp7dZAi6Xy69lPJQ/ON4c0xfikpJsdY="

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

},

"epo_sentences_detailed": {

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

• "hash": "sha256-5dhqMK3gMAjaFGndOWic1n/T6AQxSMGEmQftbiuGRic="

• "hash": "sha256-6jUCkcHL6r4tTuNW3qphgjXPL1mUrGZa36IQr1/MVlk="

},

"fin_sentences_detailed": {

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

• "hash": "sha256-r6WB6iYtDZJjEZbVSiSv5GbRqRbrTZniPvss41py8Jc="

• "hash": "sha256-yUrjOnOUuQ3d400Z5hF6MPXixvPX/fFXz8lDxXL4IDY="

},

"hye_sentences_detailed": {

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

@@ -21,35 +21,35 @@ "hash": "sha256-O9GuyzhIYsWP4UJjEhhnNocJPBso4zSoz8UnZA8iWoA="

},

"rus_sentences_detailed": {

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

• "hash": "sha256-a/j9189kqsktYDaYxFGkZkg/pztpfQZ3OgKyhHexb14="

• "hash": "sha256-qndvJjqQKUHWx8N7ULcyht6VpMDo/XvnU11Wc96zOUk="

},

"swe_sentences_detailed": {

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

• "hash": "sha256-61Fm/Lrbl3eLztuCbBw1nZFuSOL4i3xt/rXSR3FcCo8="

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

},

"ukr_sentences_detailed": {

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

• "hash": "sha256-xBCB/2/IYktxAUlJ6lVTcq6GF1iyWpZGUpxWz2rydXA="

• "hash": "sha256-knYrhBC/txKd9HQMwMaNL216kLkLzQAD/mTg60pEB5k="

},

"deu-eng_links": {

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

• "hash": "sha256-2Qndnqa+VhCEmCGe2tRyT6JpI1ZaQx/tnhKTiZ8C7V8="

• "hash": "sha256-AkD1m2Kh4qzM5roX+0CavHPxOIWslFhWRXxiAYy8wCs="

},

"deu-rus_links": {

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

• "hash": "sha256-qAyIZc4xmfC6KV0QEpCVnXq3/QmORgec0dhb6aLiIZA="

• "hash": "sha256-+/bI4HOlPojZ57SPcTH4hWEhg65SK+VyiANUULedW2M="

},

"eng-epo_links": {

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

• "hash": "sha256-3PlGAFgQdDiiAn9PA4mK6h4ctU0+GCI0rKSjNeTW2Bc="

• "hash": "sha256-5BArGLBASR7H4+JjT/x1fTo9s8ymYhfCcjlquoIdgEE="

},

"eng-deu_links": {

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

• "hash": "sha256-ZGtrxO/G0i1jUHG0sZooGNGdipv/uQ3N+xPC7SKS/sA="

• "hash": "sha256-AgKQbSXHINisteyCMAEVNEErt+o1z05+Aim/NJQzdVY="

},

"eng-fin_links": {

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

• "hash": "sha256-YVKXAnqIIxjRjDFxrYhoFs6f8szyAJvLLjCeN3kERqE="

• "hash": "sha256-Qy9TF0SppXIAcvDfS7fp6/sDLUPmj1DeM+oNx3YKwSI="

},

"eng-hye_links": {

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

@@ -57,7 +57,7 @@ "hash": "sha256-kcb5Qd+OkC+gYv1qqzwa43umeINQsp6l5ntWzKFpziA="

},

"eng-rus_links": {

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

• "hash": "sha256-JWC4fRrXmoGLgIaepa5tsiAWKqGUZyPJOYxyQ+0UXVU="

• "hash": "sha256-HJd+atXd6IeezrvYamo5NgJ34SYsk7ipPN5MIlMyBUA="

},

"eng-swe_links": {

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

@@ -65,19 +65,19 @@ "hash": "sha256-0ESW21vj0MKPjXtzi5ZOmc4Dv2wOxPx4ctI9ln44WBU="

},

"eng-ukr_links": {

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

• "hash": "sha256-wCVqOyUqTwk/BDgL75BYp4DGP7V3VFJCma3vis7Vwr4="

• "hash": "sha256-uJdnyBZVTk0vaGGr0Qj9KRdPdNPVGr2W7g7aafL7ifE="

},

"epo-eng_links": {

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

• "hash": "sha256-mv7K73UZNaApGmY319aTBH1qo/BbpmlSrqziMyqthpU="

• "hash": "sha256-0plMisOHv1u02IxnJRvOQ5Z1Hzo9ipzZxsjEX3qh5Zs="

},

"epo-rus_links": {

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

• "hash": "sha256-ZPCg83U39m878z/gZz3zIzw7VMtOQKpSBgmEkttlP84="

• "hash": "sha256-GJErBaxm7MTD/bG4keI1eH0g69x+gG1XJj/edzoY/qU="

},

"fin-eng_links": {

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

• "hash": "sha256-i96+tSGy0oJipSmRRyqf0WTmmlAsYGgDGQWYs9pXe68="

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

},

"fin-rus_links": {

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

@@ -93,15 +93,15 @@ "hash": "sha256-mIrFERFWe/j6e9dMVvh5DirgEtBU5gBj4tmBiwXhpoA="

},

"rus-deu_links": {

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

• "hash": "sha256-OaEPP5JHtluW0hs5fQPVTu/2z2N/fwAZxSLeeu/jLF0="

• "hash": "sha256-zfM9L0n7AifXmxniiowHFyGgs/G/7N2i2N1DdbvPfpM="

},

"rus-eng_links": {

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

• "hash": "sha256-hPm9qVO4b54KW2c8i+Vx/j7vjAd7kbyvlFj/5CWdtJI="

• "hash": "sha256-8XVbAzt72EvV90qtr2UZfd8+1Lpkmydadey7DZfUSww="

},

"rus-epo_links": {

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

• "hash": "sha256-M3XVpsHjGKyeHO44HhF2VaVWULPiGvJlDIadP0kbTzA="

• "hash": "sha256-O4HzQ2ctNSgQ7Qxcyv1tZuhSAZM5RuZjcs4DjOVnBZY="

},

"rus-fin_links": {

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

@@ -113,11 +113,11 @@ "hash": "sha256-uZiNGMjwIKtLTPIWE6L09KaKipq7er8oar2NIeqvSC8="

},

"rus-swe_links": {

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

• "hash": "sha256-/1EcJKhyiH29+w0lM3oCTqtxYGjtAE3Dq/0egXPiCnU="

• "hash": "sha256-iUNJvt6V+hgiUS5A/2JpFVUK/gHBPAAIqniIIu3Ldrw="

},

"rus-ukr_links": {

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

• "hash": "sha256-fL5VEBlCgm2wMJREft/MqSrhlZ1TyoHBlGI9BnKJYWU="

• "hash": "sha256-Rcvn7hQWfl6dywo/8Tft10rsA+UDg3FiYAzI6IfSfes="

},

"swe-eng_links": {

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

@@ -125,14 +125,14 @@ "hash": "sha256-YfWJ8yR5s6qytrDBFu2qHZfvEwyOlVgffeviQEsIuGo="

},

"swe-rus_links": {

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

• "hash": "sha256-e5WNrGymUWHLvG4Ul43LffAqrNHUIwM2Uo+/koIVOUA="

• "hash": "sha256-XWJdWNkiKASqALtXzeIdnQPu5LbpuRvXVzL2gFQ0Jhk="

},

"ukr-eng_links": {

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

• "hash": "sha256-uQJAO6yD6nSTXGMvJ9I+DSBJW4+hQzggAo3gIQFrs0Q="

• "hash": "sha256-NAH7QRXPIdpCh+2ZtHNcyYbHh+7jcpJZrMgIyHvAf6c="

},

"ukr-rus_links": {

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

• "hash": "sha256-iDpdTxnY8Oimvmp97dRi0S0Ykm2O8maz7Eq1qjwscWQ="

• "hash": "sha256-vslMPL4FVMrdT4jVVtHYFWzaZ70k8yAptg6xcaR2qTw="

}

}

diff --git a/pkgs/geospatial/mapsoft/2.nix b/pkgs/geospatial/mapsoft/2.nix

index 7a2ad2bf81e3615aaea3b630a80ec607b6d9bc66..7ab7907f1c0d0acce87ace9323f227035bfc221f 100644

--- a/pkgs/geospatial/mapsoft/2.nix

+++ b/pkgs/geospatial/mapsoft/2.nix

@@ -58,6 +58,12 @@

 # https://github.com/slazav/mapsoft2-libs/commit/9300f93e171769bbf8710d9dfa5f2724b7b6142d

 substituteInPlace modules/geo_data/conv_geo.test.cpp \

   --replace "PROJ_AT_LEAST_VERSION(9, 2, 1)" "PROJ_AT_LEAST_VERSION(9, 2, 0)"

• '' + lib.optionalString stdenv.isDarwin ''

• https://github.com/slazav/mapsoft2/issues/65

• substituteInPlace modules/geom/Makefile --replace "point " "" --replace "rect " ""

• substituteInPlace modules/iconv/Makefile --replace "SIMPLE_TESTS" "#SIMPLE_TESTS"

• substituteInPlace modules/filename/filename.cpp --replace "st_mtim" "st_mtimespec"

• sed -i '1i #include <unistd.h>' modules/tmpdir/tmpdir.cpp

'';

nativeBuildInputs = [

@@ -102,7 +108,7 @@ description = "A collection of tools and libraries for working with maps and geo-data";

 homepage = "http://slazav.github.io/mapsoft2";

 license = licenses.gpl3;

 maintainers = [ maintainers.sikmir ];

• platforms = platforms.linux;

• platforms = platforms.unix;

 skip.ci = true;

};

})