commit 778a37b46cdf0725081bdedbf3628804a5f4f2e6
parent 0efcab77407b4017ecf463237594f5f39de697a5
Author: Nikolay Korotkiy <sikmir@disroot.org>
Date: Sat, 31 Aug 2024 15:43:42 +0400
Up
Diffstat:
4 files changed, 44 insertions(+), 42 deletions(-)
diff --git a/pkgs/data/dicts/tatoeba/default.nix b/pkgs/data/dicts/tatoeba/default.nix
@@ -45,7 +45,7 @@ let
in
stdenvNoCC.mkDerivation rec {
pname = "tatoeba";
- version = "2024-08-17";
+ version = "2024-08-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,158 +1,158 @@
{
"bel_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/bel/bel_sentences_detailed.tsv.bz2",
- "hash": "sha256-CTgg2WGDClA5BaH+CPhXxAUf7oP5oEjZWaglLiYHCrI="
+ "hash": "sha256-LmcYxXCeIFDV7nuhRuXfZjbWezUpmASzNgIBQkbokQM="
},
"deu_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/deu/deu_sentences_detailed.tsv.bz2",
- "hash": "sha256-Q+yjEGEAxiQiaTU9b171xtBaCGAI6vS0hjx5Zubih0g="
+ "hash": "sha256-OTnouBPMHCpzv2lhS1ojDadIBDzbzXDZsG9oYrXZunw="
},
"eng_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng_sentences_detailed.tsv.bz2",
- "hash": "sha256-tlOzncF59mFJ8xOBLYE3iGSuKjav0wJmYLVDp/FjrB8="
+ "hash": "sha256-kDg6lfNrem+xJCKhFubQkBuziv0Qd87U8HkOG5vVxHg="
},
"epo_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/epo/epo_sentences_detailed.tsv.bz2",
- "hash": "sha256-6CA0748jKj+BMvrRfHAhcGpCb8EkNmiyD3OJwKLR6bY="
+ "hash": "sha256-vRSCunBXYnzbNKK5Qz3DEqjHds3LH3+ZTxqH3lzRDxQ="
},
"fin_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/fin/fin_sentences_detailed.tsv.bz2",
- "hash": "sha256-dRZM+KOjM4Gah0xsFvZfYG/CjV4iyQv7o9XsUoiUnio="
+ "hash": "sha256-I/Nql3ExMmoluZwfbWFWp4uWQZtYoFZPf41rodJbCH0="
},
"hye_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/hye/hye_sentences_detailed.tsv.bz2",
- "hash": "sha256-7JdNR6yCNZs5R1BeRgtXH4pdgcL4J/Ezys03Z+jGKpg="
+ "hash": "sha256-Ol1qUvQ2NTlZi4a2wPqerldGlHfo9hQw2o7jSWW6V0I="
},
"rus_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus_sentences_detailed.tsv.bz2",
- "hash": "sha256-UsSXiV0uyN9Fba/QljZcZ1evqGlmvywz4/p27VxA0qY="
+ "hash": "sha256-VcxXVKGOt4+RBWouC19KXNIFlHqDWQlXfMHDWNx1XOo="
},
"swe_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/swe/swe_sentences_detailed.tsv.bz2",
- "hash": "sha256-4GnImN/tnvtKpM5yRqhc7rsIEZmJmdCGDGiEvkCDSMQ="
+ "hash": "sha256-bQJl/Dhsioj3fGiMe4zWgv+jVBwLSIOb5keYgHOVzrc="
},
"ukr_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/ukr/ukr_sentences_detailed.tsv.bz2",
- "hash": "sha256-0k1DnmQa8z4gMd29wiBX6q5Pob57lirR5Q1Ujgcqa8g="
+ "hash": "sha256-Cep4fh9RibmaDBkn8Ar533IJS3VJlqrlxsSYM25j5WM="
},
"bel-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/bel/bel-eng_links.tsv.bz2",
- "hash": "sha256-/C75obO4H3fqbjZqKggyK42Qko8shSrEB1/U+kO0wpA="
+ "hash": "sha256-PcsQod9tdH5hvzPx6MUjTqc/nYYh4XXh7ZwAj5B0ZWY="
},
"bel-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/bel/bel-rus_links.tsv.bz2",
- "hash": "sha256-mpP34ydagkSbcXgeExmbVZMuHsCeqPLYx9I3IazlyDE="
+ "hash": "sha256-TgnQer2/9wUoRXPknu3+o6wGf4Bu9tYeY9I3dfH2clo="
},
"deu-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/deu/deu-eng_links.tsv.bz2",
- "hash": "sha256-mTcFVHcWzug96nIjhjhiIT5mk0W8aNOg3hIjldinSKM="
+ "hash": "sha256-IlBJtC+j1ijU2GcZucb4GeJYCDCRdyzDjwQE1jEeevs="
},
"deu-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/deu/deu-rus_links.tsv.bz2",
- "hash": "sha256-6GZgwKKk+m/DwxNb//t96eRtk2hRNK525XnFoxo+A5E="
+ "hash": "sha256-yV9XOJcxEqwT8XgO6OWOw2dTRXgAx33rDG3aYBHLp0Y="
},
"eng-epo_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-epo_links.tsv.bz2",
- "hash": "sha256-/UVQmvxfG6j09WouSKFsXMJmT6qI4Zr7QgMvGOU0EvI="
+ "hash": "sha256-Vu2KXHEjdJZXokk6kLBtMP/J343s56ftzwSgCaCHWTQ="
},
"eng-bel_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-bel_links.tsv.bz2",
- "hash": "sha256-IGvkacq7Y2ZifGhzpuhs3MdXg5KL9+8mR0jnVa+rInY="
+ "hash": "sha256-3ZLYQarvIY9XaElvh53tj4KGpax2bY11jbU0Ctt5YQw="
},
"eng-deu_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-deu_links.tsv.bz2",
- "hash": "sha256-RghdxFNXlTaIHLmHYQTEH5AWRivUGP0yCR6PACc/gAw="
+ "hash": "sha256-aWCjn55M+QxEflmxMFfz+STxUqTw3swnjRVincZeK30="
},
"eng-fin_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-fin_links.tsv.bz2",
- "hash": "sha256-J++FqUfcDp2b4Py88voh6sllMNF7C3D0db38zH96B2Q="
+ "hash": "sha256-USYWeXkpODC3GKzng1Scm9IqdyB6DOHZJYg2h/2w02E="
},
"eng-hye_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-hye_links.tsv.bz2",
- "hash": "sha256-PiKhhpchH47RzDeNp0TdaeNEsAZyDMv3zI3um+TiAtw="
+ "hash": "sha256-jsqNOtvZna1D/7fvh8xjpzaKAtloGwPgHb1Y3AN7fnQ="
},
"eng-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-rus_links.tsv.bz2",
- "hash": "sha256-wntZKoqEbtKdwGS4SU/knJmUDf7ddSA59ardSo2AThg="
+ "hash": "sha256-hpOs5NBSdRyKpSQrTP9+Na/vtrPKYjv9fCxHsYOGPJk="
},
"eng-swe_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-swe_links.tsv.bz2",
- "hash": "sha256-2RUXQns+zXZNaQ0iRUYgbEuHybvnK0omybHKFlKbT1o="
+ "hash": "sha256-1T5OpzgepN+6OeJeAL1TEj8qF1+QGIVkqpxY7Ls7/bI="
},
"eng-ukr_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-ukr_links.tsv.bz2",
- "hash": "sha256-0mXIxOy77R5J9+0RmATx0+RQ2jLX3eQ3IiSMc+VX/O8="
+ "hash": "sha256-GBGpQWlmnRmyG5Xytu4OA8p1OdaQaHYF14ov/SB3KD0="
},
"epo-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/epo/epo-eng_links.tsv.bz2",
- "hash": "sha256-B9Mm921ZSk5VuCyF3eF85BmLNf6fc7ZzrySDxjFNRJA="
+ "hash": "sha256-0hVU8NKeWLkm0bAw3gWPiGfU5LGxxFSRWrP1pGZ/EUs="
},
"epo-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/epo/epo-rus_links.tsv.bz2",
- "hash": "sha256-eQJ//lDt3Z06StZzMwroOe1HVA5OwHTSAG65LAKnbEA="
+ "hash": "sha256-30mWdJDWMiAb33QmTeQkNM7dDqzLlrhPzTJZNiTRsaY="
},
"fin-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/fin/fin-eng_links.tsv.bz2",
- "hash": "sha256-AUA44pL8Rr+ul0VyH/M8RgsKW2TLNtql5Lp2/HVDNnA="
+ "hash": "sha256-KMSysLcgqw6Ux6bFqVQGVTW4Rf1tHUcp/8WPhEq3Nzs="
},
"fin-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/fin/fin-rus_links.tsv.bz2",
- "hash": "sha256-mr1ggZwDJQ2uGC7XV2p81lk5exw7XA0glRmsOeTkt0E="
+ "hash": "sha256-Hzr1DekhnZwmpC3ZO3TewMeS/XyjAhspF16aQtp365Y="
},
"hye-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/hye/hye-eng_links.tsv.bz2",
- "hash": "sha256-gctHPRGRwH1LrF3ApZ9Zq435kwraCxDGox/OjVD64QE="
+ "hash": "sha256-7CdXaQ/CZwI1aPhz+hyhqD1JgGDJl1Tl5vrClOsN2/k="
},
"hye-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/hye/hye-rus_links.tsv.bz2",
- "hash": "sha256-B6gB902Zppkxgok7lwYwFbvIz7J2tttV6WpjX6EMLdw="
+ "hash": "sha256-rvCX9/qWXjfBaWMTRJclj9RrU7umSfb3nSzPXqU+wok="
},
"rus-bel_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-bel_links.tsv.bz2",
- "hash": "sha256-/2cxu9CyFcLpFSpeAPYLp18Jy8mrAMYVc5Z2DbDmxxs="
+ "hash": "sha256-JIJO/rGjfy6DzPPCSOhtjCfgFXz22nyQP72CdGrVJpo="
},
"rus-deu_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-deu_links.tsv.bz2",
- "hash": "sha256-TLq+SWlSgL73AUbnEJoKf+qSxV23fstLb12KFVc+GAw="
+ "hash": "sha256-fkFYNjV9+A8qSAd8JTQGGkCMCZnE0IjqN4oTTjAtqTU="
},
"rus-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-eng_links.tsv.bz2",
- "hash": "sha256-e8csGUP+P9sK2tmbcRB3DrPZ3Bio3s0RHnE4w1aE2/k="
+ "hash": "sha256-/jOU3scAlwutG7075hlZUJ2k5651Oq9ZQs3u31BiLTQ="
},
"rus-epo_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-epo_links.tsv.bz2",
- "hash": "sha256-CoytfbgcGYwAZKTyzz8BVyn1duZn3z3bUHY65ftXOHQ="
+ "hash": "sha256-O4+v08TKDuMA0EBE3e8ux8MmaXRf+rMijnmgO8vrzz8="
},
"rus-fin_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-fin_links.tsv.bz2",
- "hash": "sha256-buxOQzhzpV7XGjKdODA7JFrQPFBEOWFmhJJ3Fh0CBYQ="
+ "hash": "sha256-dL9BhvCweivYebqlv0eE2A2QjHqbFwkudqVtzGX4fTY="
},
"rus-hye_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-hye_links.tsv.bz2",
- "hash": "sha256-N1yTiIbfyCANpfbMZCqJUaCHypaMh1kx0K6mqmPxBIw="
+ "hash": "sha256-Ggk+AEJwaUFZbKujJOSSKC5vyt6tMbPNIc5HXhvBsCI="
},
"rus-swe_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-swe_links.tsv.bz2",
- "hash": "sha256-l7OSOkql1NXtHfxsSZmjs2I6HMhuri2b9VQVpdBKyS8="
+ "hash": "sha256-Kg2WCr3DO685RYMQcBrHniVxP8+7k09dfy3uFSztQBU="
},
"rus-ukr_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-ukr_links.tsv.bz2",
- "hash": "sha256-puJW5Y9q3kHpMguYkfpkIhCrgpo8pXJ9BCxDgtfX0Q0="
+ "hash": "sha256-vR8V5dc/oeDaykHuI+iKb7yW30SSnUpTnM3AqUtJrrI="
},
"swe-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/swe/swe-eng_links.tsv.bz2",
- "hash": "sha256-okTlmjwNlh9HDuLklx2c/hUusglUqgHmYsdL7DzOSF0="
+ "hash": "sha256-Rg0VZvgbbzJmnVDutEac1+C4b1zIviUUztNdMEdteOk="
},
"swe-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/swe/swe-rus_links.tsv.bz2",
- "hash": "sha256-SwAee+A4Xfd1CvHz3PmNZ5rmZhd4+fbBd4d+LUoUhL8="
+ "hash": "sha256-mTPyIdVFtdsO8DZyJenuzE9dpC9X/mqj1r6H64Mb/e0="
},
"ukr-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/ukr/ukr-eng_links.tsv.bz2",
- "hash": "sha256-kCKDR1hAJCptjG3DPsasrIYZDqqCY87o/cYul4PQNjk="
+ "hash": "sha256-C+SCIBD5cQzqYzKVCC20nepCQ08MrfIdXDZDv2HTNrY="
},
"ukr-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/ukr/ukr-rus_links.tsv.bz2",
- "hash": "sha256-CDgk8vtp9J6pHGuyI7ODoIEHEvQhDplIziszrZjPPVQ="
+ "hash": "sha256-u1nFj1s/fAJA0qgC9bfEZepWeNqFYQnEi7uRf9Cy38o="
}
}
diff --git a/pkgs/data/osm/osm-extracts/default.nix b/pkgs/data/osm/osm-extracts/default.nix
@@ -7,11 +7,11 @@
stdenv.mkDerivation rec {
pname = "osm-extracts";
- version = "240720";
+ version = "240830";
src = fetchurl {
url = "https://download.geofabrik.de/russia/northwestern-fed-district-${version}.osm.pbf";
- hash = "sha256-IQU5KUDF7wTo9Xi+sonHwGLt7CEn9bnGcZX+AbFF7w4=";
+ hash = "sha256-Nrj5qJc1AAfGPV9QfHt3A2o3NBeTeHoEvnFN6/Ybv30=";
};
dontUnpack = true;
diff --git a/pkgs/gpx/gpxtrackposter/default.nix b/pkgs/gpx/gpxtrackposter/default.nix
@@ -29,6 +29,8 @@ python3Packages.buildPythonApplication {
postPatch = ''
substituteInPlace gpxtrackposter/poster.py \
--replace-fail "self.translate(\"ATHLETE\")" "\"\""
+ substituteInPlace gpxtrackposter/track.py \
+ --replace-fail "from stravalib.model import Activity" "from stravalib.model import DetailedActivity"
substituteInPlace gpxtrackposter/cli.py \
--subst-var out
sed -i 's/~=.*//' requirements.txt
