commit 19322336ff35ee52078252ff09de47af89d9b041
parent 63e56b05cabed6450ae569395b838ba8fbb5ce03
Author: Nikolay Korotkiy <sikmir@disroot.org>
Date: Sat, 24 Jun 2023 12:59:50 +0400
Up
Diffstat:
5 files changed, 46 insertions(+), 46 deletions(-)
diff --git a/flake.lock b/flake.lock
@@ -5,11 +5,11 @@
"systems": "systems"
},
"locked": {
- "lastModified": 1685518550,
- "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
+ "lastModified": 1687171271,
+ "narHash": "sha256-BJlq+ozK2B1sJDQXS3tzJM5a+oVZmi1q0FlBK/Xqv7M=",
"owner": "numtide",
"repo": "flake-utils",
- "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
+ "rev": "abfb11bd1aec8ced1c9bb9adfe68018230f4fb3c",
"type": "github"
},
"original": {
@@ -20,11 +20,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1686979235,
- "narHash": "sha256-gBlBtk+KrezFkfMrZw6uwTuA7YWtbFciiS14mEoTCo0=",
+ "lastModified": 1687518131,
+ "narHash": "sha256-KirltRIc4SFfk8bTNudIqgKAALH5oqpW3PefmkfWK5M=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "7cc30fd5372ddafb3373c318507d9932bd74aafe",
+ "rev": "3d8a93602bc54ece7a4e689d9aea1a574e2bbc24",
"type": "github"
},
"original": {
diff --git a/pkgs/data/dicts/tatoeba/default.nix b/pkgs/data/dicts/tatoeba/default.nix
@@ -32,7 +32,7 @@ let
in
stdenvNoCC.mkDerivation rec {
pname = "tatoeba";
- version = "2023-06-17";
+ version = "2023-06-24";
srcs = lib.mapAttrsToList (name: spec: fetchurl spec) tatoeba;
diff --git a/pkgs/data/dicts/tatoeba/tatoeba.json b/pkgs/data/dicts/tatoeba/tatoeba.json
@@ -1,83 +1,83 @@
{
"deu_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/deu/deu_sentences_detailed.tsv.bz2",
- "hash": "sha256-ajj6qBUN108w/F5ywlJ2Qe3LpyOnRcMm6DvWzcs2Als="
+ "hash": "sha256-uBRQwAxvH3dJvKurQFQKKQzyB1d1pTmSuFvuyMAvlJQ="
},
"eng_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng_sentences_detailed.tsv.bz2",
- "hash": "sha256-CJcsQypy9d1MV3JXl5a0PdB6u+J50W6sDSBXMoHEfoc="
+ "hash": "sha256-0weHQRZ45b8tm/Uds6S06awPdI7U3TUtvna61qZZ4us="
},
"epo_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/epo/epo_sentences_detailed.tsv.bz2",
- "hash": "sha256-udjWXYl/HMYAM1zYlFgVMVPesgpQMjsXJgrnsYvc1NU="
+ "hash": "sha256-hnCKAI9t8WKtiMTc4ZbbGoEAeJAjPreMGr1vD6bpri0="
},
"fin_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/fin/fin_sentences_detailed.tsv.bz2",
- "hash": "sha256-eDXUU+UhwpJ9iew+8hJ7TKOXUr2FdE+otGnmgICLnvI="
+ "hash": "sha256-DifKdBjBDc4TDeiPz8poncpUa2bNVuOvsOIJHH2kmvU="
},
"hye_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/hye/hye_sentences_detailed.tsv.bz2",
- "hash": "sha256-BfcibryV0Q4/h+/Oie4201/mv681VjcBtb67LiA5Zig="
+ "hash": "sha256-XAc/LpHTkT4wSwvr2eDfvfcYcX0pU0fxPZLL6qHytWc="
},
"rus_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus_sentences_detailed.tsv.bz2",
- "hash": "sha256-BgAYZxuco33Mk9YlnV74YhtWzNJo5GHdGhao/6kLTD8="
+ "hash": "sha256-RrFXKotDTYyxcycuPXegADYia706rnjsmphR+mJHtOc="
},
"swe_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/swe/swe_sentences_detailed.tsv.bz2",
- "hash": "sha256-CSkHwhJjMs1UQLnBBIJF8aQ5KjnOAj1c6Nt4NTADMDk="
+ "hash": "sha256-x1BeBFGAMOJa4damGNi1Mcu4eWWKOoB6VQ+5H6eZHvQ="
},
"ukr_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/ukr/ukr_sentences_detailed.tsv.bz2",
- "hash": "sha256-YQLK5Tw6FTRCFDKbJIRPKIFCluXbOdq4YrOvt2eL76g="
+ "hash": "sha256-HPFlc55Wjq1+vR9uqqCXQWqnK1LTGDjWvLhGBw7z5nA="
},
"deu-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/deu/deu-eng_links.tsv.bz2",
- "hash": "sha256-SEYRfU5QpyYFykSg9t9W6oukt29Sd/Sh3h6ejxetEh4="
+ "hash": "sha256-q9bUGEq5EsczxoJI2car5qxcGxGSfyRR+7rr9GRjc/M="
},
"deu-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/deu/deu-rus_links.tsv.bz2",
- "hash": "sha256-OJg4SEHg253/NyK/cDwRc2DrRBzX30uMRinXvO/wxkM="
+ "hash": "sha256-aIKOZ9nbjks9st4jB6h23CAccu5ykqt89svP4SIHvuc="
},
"eng-epo_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-epo_links.tsv.bz2",
- "hash": "sha256-+cQXu8EtodBt5tKr3VwXbdD/U+3hucOKKm1j17MjMyM="
+ "hash": "sha256-e+0qmUgQGop8goo2K0Eh7HfN8FPTWJCU+48V12Y9S1I="
},
"eng-deu_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-deu_links.tsv.bz2",
- "hash": "sha256-qF9kR2/MF6D63mInOhllF8burclUNMphBmVihKjbS64="
+ "hash": "sha256-rTFoQ+qMX1XLwkjtlyZzjHlAZCZ+mlTuFS3cBGaUGg8="
},
"eng-fin_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-fin_links.tsv.bz2",
- "hash": "sha256-Zx2+4N2wAcGQ+tKmEzjb+/UAe2NyRKPbXV+OuJenoos="
+ "hash": "sha256-lo7jFPVE3ASMx2i6SnhDbxRx/AFTKdSFeGj8+bHAxf4="
},
"eng-hye_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-hye_links.tsv.bz2",
- "hash": "sha256-OrRH40TkAzq8xCHAfy4aE8h3QIXzzGim1PnPVN5lYSw="
+ "hash": "sha256-kcb5Qd+OkC+gYv1qqzwa43umeINQsp6l5ntWzKFpziA="
},
"eng-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-rus_links.tsv.bz2",
- "hash": "sha256-ioe3kL/3Bu8hvwAxujtECpcdix4YBZCX2lhmDBCsiEg="
+ "hash": "sha256-ViyJP1LdPHtbBwKWyBaIeMvYmEuBE+YjShfEx/pbTq8="
},
"eng-swe_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-swe_links.tsv.bz2",
- "hash": "sha256-3aslUI/wdxRIKzU0uWJGBKXu2/AoxbpQ6JGffmgcgG4="
+ "hash": "sha256-fd6PCdLZT7RODdB/ELEcS1vtukT9vjaB3AG9reT9Xec="
},
"eng-ukr_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-ukr_links.tsv.bz2",
- "hash": "sha256-PT3z98DkaZDd8fdLXt6UxrXixyociZWLP6WCq/gDa+M="
+ "hash": "sha256-H6OuMnzRRR8SskM+mJ+cMC1xR6vvq6G0uuluwRgAKRQ="
},
"epo-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/epo/epo-eng_links.tsv.bz2",
- "hash": "sha256-LOQ7iW9f1tzn2mGxK01ga+wnAE02+1CwUujptWy8mTU="
+ "hash": "sha256-fl8M6aYEPq+/xLC26Qv2x30HOlyu5aapLUfJji3v0gk="
},
"epo-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/epo/epo-rus_links.tsv.bz2",
- "hash": "sha256-prl8BGXRd22mYfw0Gh6EHFQXM6t9maJicF6l7GGtYOM="
+ "hash": "sha256-/jRFbVQbqtQa1rUtRoWPLjQ4ELd7qWVmEHO/dhXoi+U="
},
"fin-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/fin/fin-eng_links.tsv.bz2",
- "hash": "sha256-0MgEPAL7x2CkuYi/ZGr7QJtn4xiGXUk0UrrcmiZcOds="
+ "hash": "sha256-vc+mBj62o/TVmNDZjG42l4n8wLAtH+PLad4WxgZ1zXU="
},
"fin-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/fin/fin-rus_links.tsv.bz2",
@@ -85,23 +85,23 @@
},
"hye-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/hye/hye-eng_links.tsv.bz2",
- "hash": "sha256-jy+AikMbf2EOiy7fsa/pGXINjNb8A8DqoxbATtrNzl8="
+ "hash": "sha256-u1N60JWKnjZ7pKKuCE1MqjpN+OneJqfLveeqKABsVdU="
},
"hye-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/hye/hye-rus_links.tsv.bz2",
- "hash": "sha256-yCE3lT+ZmGGFxBYhvdtXOb8DamBvzs7DhOkq9sFCRsY="
+ "hash": "sha256-mIrFERFWe/j6e9dMVvh5DirgEtBU5gBj4tmBiwXhpoA="
},
"rus-deu_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-deu_links.tsv.bz2",
- "hash": "sha256-4SLKU+d2aTqJ113GCtX3O1b2IguAqKx+vTD1Og0a8q0="
+ "hash": "sha256-8sGDlW5cdeUl0slVlVHSImwsipR+sbhh0oCDuK2+zLc="
},
"rus-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-eng_links.tsv.bz2",
- "hash": "sha256-oh/mibAvpk9oXaQgC2g08N9CckewYXzdW0UCi1xs9nM="
+ "hash": "sha256-QD5BUbzcC+WQuXZ2NCPdnPwlFILRfRiccJwYrNqNQ74="
},
"rus-epo_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-epo_links.tsv.bz2",
- "hash": "sha256-HXmmtxCf2MiHHMu5aZZ00dd9bq67SAhGlzrytZDvplQ="
+ "hash": "sha256-QLe0CVCKKTS6kQXYytG05Irx3uvNYz6RNXtlL0S5oI8="
},
"rus-fin_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-fin_links.tsv.bz2",
@@ -109,30 +109,30 @@
},
"rus-hye_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-hye_links.tsv.bz2",
- "hash": "sha256-uAxl2ZeMm4AUoFz7IaVPMRRvmLYvmDckIY/3coKFKbQ="
+ "hash": "sha256-uZiNGMjwIKtLTPIWE6L09KaKipq7er8oar2NIeqvSC8="
},
"rus-swe_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-swe_links.tsv.bz2",
- "hash": "sha256-/+lY7Lsqy0FodsMYSpeOk2lEQDfFVv5pbaQR1FtlBy0="
+ "hash": "sha256-SZtGEBpZzrYZfj15tt7lTwi+OV3z9UU7vrBN7ylL4PY="
},
"rus-ukr_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-ukr_links.tsv.bz2",
- "hash": "sha256-G7eGo9h9zjA7x8MZId62Kr5ZQHpqYFfv/2EyRAIDqpU="
+ "hash": "sha256-v6LuQTHyCLNSmzV+RL81vMdDAE07I+ymmbx4WoPlwtY="
},
"swe-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/swe/swe-eng_links.tsv.bz2",
- "hash": "sha256-fyIxWw+huzR7ki6+d3r48GMbYzRhzLJbJFLfLZn5rYE="
+ "hash": "sha256-yBsoMUrIy1j/HQa8804ORCi/EC5A82ZIDQ5BngHgLn4="
},
"swe-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/swe/swe-rus_links.tsv.bz2",
- "hash": "sha256-1m/tctuUyLvisZXv+A51NIlBYLV6COBprSF6O693X8g="
+ "hash": "sha256-EKTIi08GqNBrcKvuZ4nU2Ei9dlO67qcy4AcLpw89bIg="
},
"ukr-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/ukr/ukr-eng_links.tsv.bz2",
- "hash": "sha256-DMOA5xzp4yiuuEjvPeN5I3V4ADFgbIVJ+QIPlS2c9Zc="
+ "hash": "sha256-HQcvnPkr9xTkNGtXkbP4FjYMZph8Wyq9hzp9rnPsJDg="
},
"ukr-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/ukr/ukr-rus_links.tsv.bz2",
- "hash": "sha256-RlDqcMnxZhcC4rM3xlDAoRPoG+GOaGFlMqypPKgNFRI="
+ "hash": "sha256-TK9iuT+gsgSbaXhI3nth3jPNwVisfSOpT7zjQI4pfJY="
}
}
diff --git a/pkgs/linguistics/tatoebatools/cli.patch b/pkgs/linguistics/tatoebatools/cli.patch
@@ -1,17 +1,17 @@
diff --git c/setup.py i/setup.py
-index 2a0a75d..01b361c 100644
+index 10ad3c2..4cf6338 100644
--- c/setup.py
+++ i/setup.py
-@@ -24,9 +24,12 @@ setuptools.setup(
- python_requires=">=3.7.1",
+@@ -25,9 +25,12 @@ setuptools.setup(
+ python_requires=">=3.8.0",
install_requires=[
"beautifulsoup4>=4.9.0",
+ "click",
- "pandas>=1.3.3",
+ "pandas>=1.5.0",
"requests>=2.23.0",
"SQLAlchemy==1.4.23",
"tqdm>=4.46.0",
-+ "xdg"
++ "xdg",
],
+ entry_points={"console_scripts": "parallel_corpus=tatoebatools.cli:parallel_corpus"},
)
diff --git a/pkgs/linguistics/tatoebatools/default.nix b/pkgs/linguistics/tatoebatools/default.nix
@@ -2,13 +2,13 @@
python3Packages.buildPythonApplication rec {
pname = "tatoebatools";
- version = "0.2.1";
+ version = "0.2.2";
src = fetchFromGitHub {
owner = "LBeaudoux";
repo = "tatoebatools";
rev = "v${version}";
- hash = "sha256-ZsaXhGxlxFMpV4cvxfj23p4M2/zStq2VaRSSCiARd+8=";
+ hash = "sha256-/xg57VYlrdfJV/6uvWsb+6OE5Hl4Vb9pukC5IvYRhoA=";
};
patches = lib.optional (!checkLang) ./dont-check-lang-validity.patch
