commit f79b5dcb16c7d15c3bee0de4b6ea3bb3255aa57a
parent b84b260ccdb0320a0bf69b075ef4b136b6f7cff0
Author: Nikolay Korotkiy <sikmir@disroot.org>
Date: Sat, 27 Jan 2024 14:22:27 +0400
Up
Diffstat:
8 files changed, 54 insertions(+), 54 deletions(-)
diff --git a/flake.lock b/flake.lock
@@ -20,11 +20,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1705666311,
- "narHash": "sha256-VYdSQm7zq3AStyHhRr3SBCTA8fVzrl6WtIlXTs2Wlts=",
+ "lastModified": 1706173671,
+ "narHash": "sha256-lciR7kQUK2FCAYuszyd7zyRRmTaXVeoZsCyK6QFpGdk=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "a455c5fb3ee513e2f443838a0e84d52b035adb67",
+ "rev": "4fddc9be4eaf195d631333908f2a454b03628ee5",
"type": "github"
},
"original": {
diff --git a/pkgs/data/dicts/tatoeba/default.nix b/pkgs/data/dicts/tatoeba/default.nix
@@ -36,7 +36,7 @@ let
in
stdenvNoCC.mkDerivation rec {
pname = "tatoeba";
- version = "2024-01-20";
+ version = "2024-01-27";
srcs = lib.mapAttrsToList (name: spec: fetchurl spec) tatoeba;
diff --git a/pkgs/data/dicts/tatoeba/tatoeba.json b/pkgs/data/dicts/tatoeba/tatoeba.json
@@ -5,35 +5,35 @@
},
"deu_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/deu/deu_sentences_detailed.tsv.bz2",
- "hash": "sha256-MFCoVZlVibFx1igMxPUh9tCvBz6nuIifuytsxqZyi/Y="
+ "hash": "sha256-Q5/3RF4oEQWeoYNgXXLkaBbHv3NvOYp8lJgzD/U+HIY="
},
"eng_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng_sentences_detailed.tsv.bz2",
- "hash": "sha256-u7eCK47Jsx4HXT/FfwHAS7eIbv7bOlc0hdgjFPDGERo="
+ "hash": "sha256-50UJvcKw0cp3SgfyekJdJZWXp+XX/0pvfqzF1I+mtgk="
},
"epo_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/epo/epo_sentences_detailed.tsv.bz2",
- "hash": "sha256-ivfXKB0iEw/oJ8hm2kuZ+wOmdi6PWxEBtwyJszuHpS4="
+ "hash": "sha256-yN8xMGz33DjGWWxUJ7KzjTEkm4jd5hh7E5fSK+Go8lY="
},
"fin_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/fin/fin_sentences_detailed.tsv.bz2",
- "hash": "sha256-gDIGWgTjzpWEAmULOIbwQKJAMoLpf0+2wT/DhB6tzKg="
+ "hash": "sha256-izRFSJ1lfIR9jkKXztXPINyKaQlLXi80CnL96CdY8GU="
},
"hye_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/hye/hye_sentences_detailed.tsv.bz2",
- "hash": "sha256-4oEIfoMBePm4ETMLZRCYY4zWa5GnM0NpRPLxSSVk3+M="
+ "hash": "sha256-dIMh7qk+oI7WdZF592ei4+H7Svbf6U8W62mL79558gc="
},
"rus_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus_sentences_detailed.tsv.bz2",
- "hash": "sha256-U2pMYW6ewtl/0eaIMZDfnR7VxUJBgtWCzFHlbxyKIKk="
+ "hash": "sha256-ppfRThZp0twpmbDK1fP+rV6BQvGtoTHL9TDAULPZcwg="
},
"swe_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/swe/swe_sentences_detailed.tsv.bz2",
- "hash": "sha256-8G79Sa//ugA1CZ+sPVmBbjLiN92H54+x6NkSEgCGffg="
+ "hash": "sha256-tOxbnfbdqxcgJKaI/RvkRRA85N6jriLrE7LPq9iiq90="
},
"ukr_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/ukr/ukr_sentences_detailed.tsv.bz2",
- "hash": "sha256-hFIedirQnbEIJaevNXxDVaB8RawBVV7kvBuS42x42PI="
+ "hash": "sha256-qafh5PVIA/HLd7JzK8W6Z++LMzyz2RdP2LLE9ITzhIU="
},
"bel-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/bel/bel-eng_links.tsv.bz2",
@@ -41,19 +41,19 @@
},
"bel-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/bel/bel-rus_links.tsv.bz2",
- "hash": "sha256-AIxSnejw/dbG1OfXCAelp5D65g+7IZ5l04xwmno5gms="
+ "hash": "sha256-NCcGxgGhBRjHlS+MkCTCkUxfczgDs1+TmBeUrbDeFfw="
},
"deu-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/deu/deu-eng_links.tsv.bz2",
- "hash": "sha256-5g6/rqfAj4mlHwjMKFBirlZbWk57twejYKR4dKMzeSk="
+ "hash": "sha256-XYVLoQboeE0AvdRIlfek65FaKNqR+17JmT6v07ts5E8="
},
"deu-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/deu/deu-rus_links.tsv.bz2",
- "hash": "sha256-g/UV0Z/Hwr66aSipugDl1UdqBgnNTRvm0eLhyxQ94PY="
+ "hash": "sha256-niOBgFogv0WgIFfDchVbu3KGA0NIm4cjWMX17PNaFCA="
},
"eng-epo_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-epo_links.tsv.bz2",
- "hash": "sha256-EAnV9M3QmdPOb1qhHztPecNrvvhkT37tvE9U25OkxfY="
+ "hash": "sha256-JZIIvNYZzq1etpqPS+yl5SG5Re2OmcbUTnl6WatIKEg="
},
"eng-bel_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-bel_links.tsv.bz2",
@@ -61,98 +61,98 @@
},
"eng-deu_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-deu_links.tsv.bz2",
- "hash": "sha256-Ocpb7x+xaD/DC48QJ7etk2PVJgFEmAx0+HGz1BlKL+g="
+ "hash": "sha256-2tpBa4hAtqblEJv04O2sgmTNigOANjxLUrouKRet7nA="
},
"eng-fin_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-fin_links.tsv.bz2",
- "hash": "sha256-p9rfm4VGv+/JZQJI76r+EphTZvqRe//2GfwccSt4CYM="
+ "hash": "sha256-SJGdfRMsfw2K/rYGdWafgJ7DariiHr2qzNqpwE/8GDQ="
},
"eng-hye_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-hye_links.tsv.bz2",
- "hash": "sha256-XaW6V+l+JZwe9ghGYVYzOKvVimF8KLSF9Ff09/QJcLc="
+ "hash": "sha256-38BTVf/hVcz1+XsLfEHDxjEMbdCFphg0QAlAF7iPgcY="
},
"eng-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-rus_links.tsv.bz2",
- "hash": "sha256-k14z5qn9BWYzofalydUuzLSJ9zdweKw9XWeXndnZi0w="
+ "hash": "sha256-6AmaB3oNftF9srWQvxPpZZbb32AyFac4fJqft3G5Weo="
},
"eng-swe_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-swe_links.tsv.bz2",
- "hash": "sha256-Osa/5iETNBP2Mp1SGInUT1C/0gzzk3yd6UMJ4uuOxWI="
+ "hash": "sha256-oo81GvjMPSZJ3pJ2zBCJGVt1+sPFIBGgn1CISi948Kw="
},
"eng-ukr_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-ukr_links.tsv.bz2",
- "hash": "sha256-i29F2KZlvangnN0kYTPOSRaqhgVLkYnoHxVyhAF0Kpc="
+ "hash": "sha256-SDEBJHsCwXbb2ox6ocDjpw2ylp7OLknp02GMmcEacwU="
},
"epo-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/epo/epo-eng_links.tsv.bz2",
- "hash": "sha256-VSZ8KrzMRJFQhHocD+ZWSO6WAPzAKTb3zG5lYFVk5Cc="
+ "hash": "sha256-6P0BVpnGFFxhyhWFoLPodOeuudPlt/Z3H558qFqPI2Q="
},
"epo-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/epo/epo-rus_links.tsv.bz2",
- "hash": "sha256-EzNReqWtnwD6M6vA0Oh6GBJVtTJHgpu/liw38ef3cBw="
+ "hash": "sha256-YLazvPiyeLNi5fcKTwNhmin8s6mKo3fed50BjWGB3PM="
},
"fin-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/fin/fin-eng_links.tsv.bz2",
- "hash": "sha256-GSlCKkd9wEs5dL4wA4amMsnMTLAiD6WdDZawgYVLAIM="
+ "hash": "sha256-Kkb4a5H5qhUcZfhlYH79nCXDTotrFfgJXuxjVlPS3eY="
},
"fin-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/fin/fin-rus_links.tsv.bz2",
- "hash": "sha256-GkHEhveGtI0JBpw3wxszgfwA0j5rJhp8zfzi4UhqXTM="
+ "hash": "sha256-lhLr1UU0sBdA2WVC4A/6a5edIzuOo/5f4RX27AEua0Y="
},
"hye-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/hye/hye-eng_links.tsv.bz2",
- "hash": "sha256-uanNeyKCzIw2vEum0yfiw+thg77tzBrZxsMpKoIXVYA="
+ "hash": "sha256-P8FVWe5kS2mZcJxYIPPcyj79c706Oc+VS1fSmtFNgWA="
},
"hye-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/hye/hye-rus_links.tsv.bz2",
- "hash": "sha256-ibgBo0pjZ2uABQYd2mWFAdpsjpvBnwMH+Mj7a4R5XLQ="
+ "hash": "sha256-Zk9+ezez1Zlyc4Gy/1hJx5T155KkRV6T9O4phu3wSsY="
},
"rus-bel_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-bel_links.tsv.bz2",
- "hash": "sha256-7ZlKpCk7+x7VxcQNZDH+oPIT9/lC0GW1WZV5dbEmUA8="
+ "hash": "sha256-ognkRXSO8jmpb8TmO5QHaoUC7PiC3nPCR6Mcz1g3wFI="
},
"rus-deu_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-deu_links.tsv.bz2",
- "hash": "sha256-rRtoevfPV398m68OTBjoov2ZJEK0xOm0+R+JPRkAGP4="
+ "hash": "sha256-R/721t+NNt4JKD28b/STvwVTZpaQht054WvWfrz2yMs="
},
"rus-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-eng_links.tsv.bz2",
- "hash": "sha256-ScKyN3zFRFSo/J/ssIM5FIA2Ah5i5IhZKst25PQg6ig="
+ "hash": "sha256-DXGm0ypXNF/AUQYzxaGvVwtEiDhZQu1aDY8q0ICG9xU="
},
"rus-epo_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-epo_links.tsv.bz2",
- "hash": "sha256-i7JNlxORiMRZoE9zq8O6IeZzyXC/nwBvQXdlnS2iUjE="
+ "hash": "sha256-mCoEtYtr4GS2+VdwKwGbpHnvXtGYcl8O4I6S6kjKJG8="
},
"rus-fin_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-fin_links.tsv.bz2",
- "hash": "sha256-XwjIiZ+ZhqNIpXSsVap/YrnfIOkAbwbTIEgYfQUh26g="
+ "hash": "sha256-lTCf32gUSqbGj+qUDr2xoGYd7j2fD8bKPqTyvcKlXnc="
},
"rus-hye_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-hye_links.tsv.bz2",
- "hash": "sha256-sfjrh9j1Dij7i7QTgPyx1i2SLzcU4CkwimE/CQGIyxE="
+ "hash": "sha256-UfFsaUD/7v5mrBNApTe6M/xxRi9hwVIIu+VDZ0HHvQE="
},
"rus-swe_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-swe_links.tsv.bz2",
- "hash": "sha256-Gh+u9COBi1Ers9pYJW1Un7nkCWx8BjqFQVVh9mWpxss="
+ "hash": "sha256-y/uo7Um9gnD/ewYgI6fNmPcBImv3cOrAVcyTKRCVdb4="
},
"rus-ukr_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-ukr_links.tsv.bz2",
- "hash": "sha256-xIbXXZuScMozLE4wHlwaf0mKvPn5mO2AH0mWYiq9EC4="
+ "hash": "sha256-NUbeEhOQptHMKOlkRJaBy+cuZBrM5AvRbkoMLi+QkGc="
},
"swe-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/swe/swe-eng_links.tsv.bz2",
- "hash": "sha256-OuwdqLDM6olznQY6WB4kELdm+rfmY5jd07d468ArckA="
+ "hash": "sha256-levxkkQKOfsrWCYZVF3k+VKOCHNPqdUuSXrx/Pgo+kw="
},
"swe-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/swe/swe-rus_links.tsv.bz2",
- "hash": "sha256-ESPvnGJbCHfbz9174YNTFnAYt/aF3e/gRCkoQ66dxY0="
+ "hash": "sha256-+V9aAjXeOKQlq6b+SdMhjSg5iMY+lXbpm6Y3PFsKH4I="
},
"ukr-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/ukr/ukr-eng_links.tsv.bz2",
- "hash": "sha256-GHS/1eWW+aD1pB5ddc6VlTwX4m9Vj1rZ56h5UrR6nEE="
+ "hash": "sha256-LkHCz+OiEza8GHYQJ9jQIWvmF73rj5ghTTcj1uL0pd8="
},
"ukr-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/ukr/ukr-rus_links.tsv.bz2",
- "hash": "sha256-3z7GZ0g6uQ8O+04si+NTB8CMwBlr2CKquzEaP4HxJBk="
+ "hash": "sha256-cqHPc0zzjMGhX0ktlfjqrNW1X3PLbwCR1VqJIfC+hJ8="
}
}
diff --git a/pkgs/data/osm/osm-extracts/default.nix b/pkgs/data/osm/osm-extracts/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "osm-extracts";
- version = "231229";
+ version = "240126";
src = fetchurl {
url = "https://download.geofabrik.de/russia/northwestern-fed-district-${version}.osm.pbf";
- hash = "sha256-fTCbotVA8Mue7f4RyWQVL28oT+OOlb80DvppNLYEzIM=";
+ hash = "sha256-4rpSuUVQWtGdWUDetBQXaV53wNS2r32RRtqbP9oulNo=";
};
dontUnpack = true;
diff --git a/pkgs/osm/osm-area-tools/default.nix b/pkgs/osm/osm-area-tools/default.nix
@@ -14,13 +14,13 @@
stdenv.mkDerivation {
pname = "osm-area-tools";
- version = "2021-01-04";
+ version = "2023-06-15";
src = fetchFromGitHub {
owner = "osmcode";
repo = "osm-area-tools";
- rev = "b96db0ced55f1bb574084620ca34f0a2e9d19b5a";
- hash = "sha256-bMD+8Md3rwlpsAu48YerfIFGq86PDfqTsKw5JeQUi6s=";
+ rev = "774443167f2e08222178253d83de359eb967d1e2";
+ hash = "sha256-3RfZhexzaLx3CJol3gKkNP4f9z0ccT1l2WNf3EOuhkE=";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/osm/osm-python-tools/default.nix b/pkgs/osm/osm-python-tools/default.nix
@@ -2,13 +2,13 @@
python3Packages.buildPythonPackage rec {
pname = "osm-python-tools";
- version = "2021-09-16";
+ version = "0.3.5";
src = fetchFromGitHub {
owner = "mocnik-science";
repo = "osm-python-tools";
- rev = "4ae053f65c1639bb8f0fe961c94594d31eada952";
- hash = "sha256-3Eru0pXJtKDBs3mSpW+Z+r8d2XLmuMRTEhA4IMPrPpQ=";
+ rev = "v${version}";
+ hash = "sha256-lTDA1Rad9aYI/ymU/0xzdJHmebUGcpVJ0GW7D0Ujdko=";
};
postPatch = ''
diff --git a/pkgs/osm/osm-tags-transform/default.nix b/pkgs/osm/osm-tags-transform/default.nix
@@ -12,13 +12,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "osm-tags-transform";
- version = "2022-02-19";
+ version = "2023-08-06";
src = fetchFromGitHub {
owner = "osmcode";
repo = "osm-tags-transform";
- rev = "d8f8f729cddee97964081de25e591428dd610a9a";
- hash = "sha256-PBxH5RGoimX+pyr17UAMJVbdknciT8M8WCzw6tWLwEs=";
+ rev = "f8717b52aba371a38e0fe538a6e0b0c1bcc7049d";
+ hash = "sha256-X0KsPlNac5ASuYjQRu75t5OL9WJSqIrXYFXyY1qFn+c=";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/osm/taginfo-tools/default.nix b/pkgs/osm/taginfo-tools/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation {
pname = "taginfo-tools";
- version = "2022-05-04";
+ version = "2022-05-24";
src = fetchFromGitHub {
owner = "taginfo";
repo = "taginfo-tools";
- rev = "3b54480e6f4fcfed7bfc064e074250ca97ec4644";
- hash = "sha256-aJQy8BijmiLEOhEzdpzyCC6nK4b1EafZZ/UoZu18LDU=";
+ rev = "28264e63a2b3027cec69ae4906ef689029df627b";
+ hash = "sha256-AAfrwH+9ON68V8ey5FZge2NVGanQlcxs6qUDnKgt5WU=";
fetchSubmodules = true;
};
