commit 6d0bdb9e8bf60e5fe7b117842660290e74779223
parent 84107f4359e6de312496a11c84e74cdfb8152e80
Author: Nikolay Korotkiy <sikmir@disroot.org>
Date: Sun, 19 Feb 2023 13:18:39 +0300
Up
Diffstat:
4 files changed, 45 insertions(+), 38 deletions(-)
diff --git a/flake.lock b/flake.lock
@@ -17,11 +17,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1676209454,
- "narHash": "sha256-alj9mBkV9U6tTPDK026671D2pesLSYZZc9j5dBZJ9f0=",
+ "lastModified": 1676763583,
+ "narHash": "sha256-y8j1GRwWeRN7KIrUIksgoTyYXWjraWvMtWK/cc4muNY=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "8c619a1f3cedd16ea172146e30645e703d21bfc1",
+ "rev": "06365ba4549654b7ce58c33365c1282800e83a9e",
"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-02-11";
+ version = "2023-02-18";
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,19 +1,19 @@
{
"deu_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/deu/deu_sentences_detailed.tsv.bz2",
- "hash": "sha256-96uC/DBGRQ8vgR1bRN05px+jbRRMBwNkcuZKuDF+G1E="
+ "hash": "sha256-zPXr4ntOraUkfAhF7nVG7aMAQ9VcBkiDvXe2AyIP1X0="
},
"eng_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng_sentences_detailed.tsv.bz2",
- "hash": "sha256-eR2DjMwSGRVmzIqjldgUw18i0CDkGNIS5lEguCscVYU="
+ "hash": "sha256-GB+lMffh8mrNje9TIGakXax8ZseBDnKg+94DmsomON8="
},
"epo_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/epo/epo_sentences_detailed.tsv.bz2",
- "hash": "sha256-F+4lkBIK7f4jjU2cbRmNYKo2yAOl0FbagSbiY+oXLTs="
+ "hash": "sha256-hY32Y10xzjCaqs6k0IpkDblAYgzccnbNXgbNV6NzJPU="
},
"fin_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/fin/fin_sentences_detailed.tsv.bz2",
- "hash": "sha256-Y+rp2qzbTUWziEWufUrQNDjo+8VrYud1YAo9G4DbqiA="
+ "hash": "sha256-oaBuWtPj0uArMzVHZuCZiJHP3264vAF5diyJ0m7f35E="
},
"hye_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/hye/hye_sentences_detailed.tsv.bz2",
@@ -21,35 +21,35 @@
},
"rus_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus_sentences_detailed.tsv.bz2",
- "hash": "sha256-PzLqeBSKDGM44ERzwbkHUWitJjmeT8vjqjFuiSpu7/w="
+ "hash": "sha256-K9bCdA/mMAz+3gG8I8HsIc5mawm6s87rdhLxCG8pkPU="
},
"swe_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/swe/swe_sentences_detailed.tsv.bz2",
- "hash": "sha256-rtLbx1h5Br8U1rht8HLiPLO94WFsR3RRzYYy9l5Wjyw="
+ "hash": "sha256-/CuT54vbeUdHaNv5038N8EmPHdOoPh9pjzMzLEZY8Gw="
},
"ukr_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/ukr/ukr_sentences_detailed.tsv.bz2",
- "hash": "sha256-x+R/+OPQ4PahqoSONAPHuKX9mMMfsfVGs7mw5CQoXaI="
+ "hash": "sha256-UiZCeX7DO6pLrjuGFw5f9qfXw9BbBCLiwCOdb/ZBeWY="
},
"deu-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/deu/deu-eng_links.tsv.bz2",
- "hash": "sha256-msP7Huq0Az+/i9+vPpYLXl8ZoQ9zpGDdYVNpwSKXI+4="
+ "hash": "sha256-M7KNTHTINSqXxuLmjIHrQAvWCJYeP8gVA4iZFeYepfE="
},
"deu-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/deu/deu-rus_links.tsv.bz2",
- "hash": "sha256-Qc7mqmMU02OX+0pd5VtWPw7UN7OcHJz+g01BSh/CzcU="
+ "hash": "sha256-wADVKPLdVPl5904u+m58G0/0KuRMRpp9820IoZsN2MI="
},
"eng-epo_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-epo_links.tsv.bz2",
- "hash": "sha256-ng9SteQdaSIrJOUyRD4Go+K+CDqPKZPkRpHhwcDFygc="
+ "hash": "sha256-iISU6kbW+vNxr6+y1Yg+kO8YpcncTXhzgPkBVssG0Jg="
},
"eng-deu_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-deu_links.tsv.bz2",
- "hash": "sha256-O1ByLXMAm54wgEY6T/QPxGFGXzWpYWjYMnW/3Gnzpg4="
+ "hash": "sha256-5PzQdfnWMxfUPbxqmFVkLortZCV8+GH4kYuTfqsLNbU="
},
"eng-fin_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-fin_links.tsv.bz2",
- "hash": "sha256-F6gsZPFWINwkem1M868T9PMFEZIAbFgvOJ1isN1JP7A="
+ "hash": "sha256-elkBV+Q4qviAisM8rXLO/vwjV+Wdqoig0OMzec0BD58="
},
"eng-hye_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-hye_links.tsv.bz2",
@@ -57,31 +57,31 @@
},
"eng-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-rus_links.tsv.bz2",
- "hash": "sha256-nRn4eSFMPW1hyW/oMBMiqPzwIohfYYY9tNKmSuddX14="
+ "hash": "sha256-1WQFUekKfistkxkTsMsshykkM+J4mHMGuDdMN28c+tU="
},
"eng-swe_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-swe_links.tsv.bz2",
- "hash": "sha256-Ry2k0er2hq5e/7QMM9CRv76DUkHYmxCGhqqNzSeJJ8Y="
+ "hash": "sha256-gfq3lw7kcg4PBwaQNPuUJFkzYznyhWXrbEKB2nPu9Gc="
},
"eng-ukr_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-ukr_links.tsv.bz2",
- "hash": "sha256-hGJqmN9fJ9tVZDXFlWwjzF0CWfOSnSSiNOoMTBjQRkQ="
+ "hash": "sha256-QyMxzlahjbnN6X0bGTJLLS5kfXrGwnxug9UIFYkBZmM="
},
"epo-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/epo/epo-eng_links.tsv.bz2",
- "hash": "sha256-CPch8zaHU09HUX9mztVYmd5+/EIWqaKmbRsjElVwGOE="
+ "hash": "sha256-bt7gSae8/A12gKcG5wJ+hVcCQV3tVcGzbbyYZNXyDbE="
},
"epo-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/epo/epo-rus_links.tsv.bz2",
- "hash": "sha256-XY5EtDy0XC5XYOFHrhF3ogVTUDzTm7TXLCO6bXoMy8o="
+ "hash": "sha256-mD9Oriqnit4oPmej/b1DyXIQMVS/4f8InfkHhvWTu3c="
},
"fin-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/fin/fin-eng_links.tsv.bz2",
- "hash": "sha256-XzVR4P1Th+4HUhTdVaIxEM8nqtV7rhdqkhjpiE71pwc="
+ "hash": "sha256-miskcmcVpDP2BCrSLXXL56yrlyAvTsiCkE70zGS7Kww="
},
"fin-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/fin/fin-rus_links.tsv.bz2",
- "hash": "sha256-woJYvzXYeXXNCqaVlNLJHNu0OGOc2edBsw33wSXkM9I="
+ "hash": "sha256-W4az1f+Y0raI3284Ig6A8CEynYLK0N1I/KwUgQbAWIk="
},
"hye-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/hye/hye-eng_links.tsv.bz2",
@@ -93,19 +93,19 @@
},
"rus-deu_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-deu_links.tsv.bz2",
- "hash": "sha256-F6/9vLwVQEgTHgPR3TzdkLQoqZAjigmFdsTyvY4abls="
+ "hash": "sha256-QZdBiQ5Acaux7aJsizVGWUplFZI9M3L1+YP0AFXrKcY="
},
"rus-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-eng_links.tsv.bz2",
- "hash": "sha256-nSlYSvVVypMCGH528+TrP7jvRSr/mJ11NcZVCiFeDrs="
+ "hash": "sha256-kuXYLnuJiKZIoqVLJqZIFXRUlTNGRFt1sS3irqw5ytE="
},
"rus-epo_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-epo_links.tsv.bz2",
- "hash": "sha256-Sfn5mdv2b3syekVNBj8ickfd3+nRdcDSZxgY1+avrHo="
+ "hash": "sha256-FE6sA5JV+ZE+hdx6KDQAe4xtDkJ6NkQ7wOvVfY4fqIg="
},
"rus-fin_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-fin_links.tsv.bz2",
- "hash": "sha256-MZ4fcMb898bl6id02tyN2hjh1XpJpLbKeTiOBDJ7jFA="
+ "hash": "sha256-4Yl/3uRrtzyKnAkU7uhJJldVcx4D36b+xqXE+TmTjyA="
},
"rus-hye_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-hye_links.tsv.bz2",
@@ -113,26 +113,26 @@
},
"rus-swe_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-swe_links.tsv.bz2",
- "hash": "sha256-x9RpuPWFol2kPxPoqwJgDnH3Y1o/utI5u61fKVulopU="
+ "hash": "sha256-HDmLRikdJElxjkI4ReZ9Ad6uJD5InS6UYoudBiw/Kds="
},
"rus-ukr_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-ukr_links.tsv.bz2",
- "hash": "sha256-3nhR11TePG9NzXgDruFExcNjKkJeNrsX4z2QNCyCRrI="
+ "hash": "sha256-bUieNRX0Eh//aDw1xZTMf4v4BQW76T7AnLyKTeGV034="
},
"swe-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/swe/swe-eng_links.tsv.bz2",
- "hash": "sha256-OIiHtN2pM5ivWQKTmyOTm5nqKnwK5xkQRrF0j7BbNsc="
+ "hash": "sha256-g4LElbWp7XN4zxd9MQAYsRiiwsE3ehzRGSx+PRZ17Zo="
},
"swe-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/swe/swe-rus_links.tsv.bz2",
- "hash": "sha256-RXn7zaW4sBDqq+muNIDwElV0iAKIJ+hCqz699yGzEKE="
+ "hash": "sha256-PckyIzGDxIa0LufTbfj8iw01W9QmjinwxZTnxhGj16E="
},
"ukr-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/ukr/ukr-eng_links.tsv.bz2",
- "hash": "sha256-7EPx3cX3IWPC+9gg2VbqTXgyoySWqnlftrGt/s401II="
+ "hash": "sha256-o+RmbB/2EI2WKVqvfRTSAJadYXreuUIX3ybnVOcNJr0="
},
"ukr-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/ukr/ukr-rus_links.tsv.bz2",
- "hash": "sha256-eECtbTSWnUxvVJSyHZtzsfb5vEhZ8KECqBImK4dj36s="
+ "hash": "sha256-5kA/HQoIhsr5JrFvRetmFWAmzfrt+mmkddSjLSDqUa8="
}
}
diff --git a/pkgs/gpx/gpxtrackposter/default.nix b/pkgs/gpx/gpxtrackposter/default.nix
@@ -1,23 +1,30 @@
-{ lib, fetchFromGitHub, python3Packages, s2sphere }:
+{ lib, fetchFromGitHub, fetchpatch, python3Packages, s2sphere }:
python3Packages.buildPythonApplication rec {
pname = "gpxtrackposter";
- version = "2021-12-01";
+ version = "2022-12-28";
src = fetchFromGitHub {
owner = "flopp";
repo = "gpxtrackposter";
- rev = "d7ff0ba61f6396938efd075d841a7c4a226a6f5d";
- hash = "sha256-J1CZ2wrL8Myd++skUOyyXLDPyRpOsBWEGxzqhk7OKqU=";
+ rev = "e872069af0a713a479608a4a5a7987570e3bc206";
+ hash = "sha256-7eJVVJIseQabSVBVogqGmKepRseWCzQvOhNfbfGvbCM=";
};
- patches = [ ./fix-localedir.patch ];
+ patches = [
+ (fetchpatch {
+ url = "https://patch-diff.githubusercontent.com/raw/flopp/GpxTrackPoster/pull/108.patch";
+ hash = "sha256-9h6ymt9z0OUFNwQq4hGCTmT389ulbBzSYJ7r2k4mO4U=";
+ })
+ ./fix-localedir.patch
+ ];
postPatch = ''
substituteInPlace gpxtrackposter/poster.py \
--replace "self.translate(\"ATHLETE\")" "\"\""
substituteInPlace gpxtrackposter/cli.py \
--subst-var out
+ sed -i 's/~=.*//' requirements.txt
'';
propagatedBuildInputs = with python3Packages; [
