commit c2a537e386c2b4a8118c7e5556e6ca006c8ddd40
parent ec9ee280cdfc97709dfd965e5b4355f9df47864e
Author: Nikolay Korotkiy <sikmir@gmail.com>
Date: Sun, 14 Nov 2021 11:44:53 +0300
Up
Diffstat:
6 files changed, 45 insertions(+), 31 deletions(-)
diff --git a/flake.lock b/flake.lock
@@ -2,11 +2,11 @@
"nodes": {
"nixpkgs": {
"locked": {
- "lastModified": 1635808042,
- "narHash": "sha256-kQg7LzPj+UQlCAgD0dJhJ88QdzduXwIyqnTLXScKBbY=",
+ "lastModified": 1636827220,
+ "narHash": "sha256-1TE4YoVvd3C9/+0t/oxBeoTz9tXhHDtcGUIPITB2b4E=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "550dab224a26ec25e20e82c0c8bfc764e01b772e",
+ "rev": "cf6b299a38ad35f5f436001eac51d6a964a9e53d",
"type": "github"
},
"original": {
diff --git a/pkgs/data/dicts/tatoeba/default.nix b/pkgs/data/dicts/tatoeba/default.nix
@@ -24,7 +24,7 @@ let
in
stdenvNoCC.mkDerivation rec {
pname = "tatoeba";
- version = "2021-10-02";
+ version = "2021-11-13";
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,98 +1,98 @@
{
"deu_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/deu/deu_sentences_detailed.tsv.bz2",
- "hash": "sha256-gE7EjLoDq7BTAdhu2/mNLtADhoAjstFRLFoUVL8prHg="
+ "hash": "sha256-WLn0/FodTkN9V+LmrCRIpT6FEOvVP/6PWu5QVs9p/uA="
},
"eng_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng_sentences_detailed.tsv.bz2",
- "hash": "sha256-K5wHrlfOXxPVMwKKLYj6I54vWe9aHRzWUKVZHqq2MBE="
+ "hash": "sha256-8nzlDtMnqNBQ0W3B8LLpd4T00hSNgS/OdKr0o+RdjQE="
},
"epo_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/epo/epo_sentences_detailed.tsv.bz2",
- "hash": "sha256-MxPoksoHfLo2wMRgalP6HjdhuXRVYkLF5KcyhktDorE="
+ "hash": "sha256-Oi4fZdTxlPXqGhyYGXL+3zge9Ok79OWMjN5Qd78egRU="
},
"fin_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/fin/fin_sentences_detailed.tsv.bz2",
- "hash": "sha256-NuPHwKzPZfc+aG01kNV5ON6s+3A81RnfnuFbxJbuvcw="
+ "hash": "sha256-qXj2LQotjVPjMGKij39/ff7aNg6ZmwT8AUPQ+6nZ+zQ="
},
"rus_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus_sentences_detailed.tsv.bz2",
- "hash": "sha256-ueoJ4/TZ5Z7wMZxbRM+lPOV9/h28UXquAuOQfQ5F2+4="
+ "hash": "sha256-xDLdyDmzwd9WrA1PeRddqDXr7O860IpqpbIpeqw4flk="
},
"ukr_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/ukr/ukr_sentences_detailed.tsv.bz2",
- "hash": "sha256-QWQSgIWPsCp5WHU/yA9vBAqcDgsfnNEdUgVbYeX2wxY="
+ "hash": "sha256-ahwhKGa2x6Vq83S0/rpY7NBpZrDi6/0M/3eebPsbjFk="
},
"deu-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/deu/deu-eng_links.tsv.bz2",
- "hash": "sha256-bbDxyd5cevxbql01S/nGxK8a0FU7HELe7weTrwMrH88="
+ "hash": "sha256-TMrSjzT20VkygjGo+Hfme8Hi2BQ/yzT1YgXAH0EOuPk="
},
"deu-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/deu/deu-rus_links.tsv.bz2",
- "hash": "sha256-DgY9aX3vnMacCYvM/t75UR78xo77Zxo5FuNLxl16EQI="
+ "hash": "sha256-HPdAzb1DYUMRvHHT+ldbS4WfQz0GCKpUkDMcRtQ/sQ4="
},
"eng-epo_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-epo_links.tsv.bz2",
- "hash": "sha256-MfwVCgIKr++Cp00ftmSUnK7fgQK2ojmPOz69a/mI6Bg="
+ "hash": "sha256-YuwZKKA4HLPrfGqKuFvKKESBk9ioiYT0aesDX4vbgZk="
},
"eng-deu_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-deu_links.tsv.bz2",
- "hash": "sha256-ADDPggu1bfDae0bu86PtnUr19pRk5KSdwBjbOUBIHfM="
+ "hash": "sha256-q4CIAiaCEfPbCpNhvN1CZInDCIiP14yW67ZK1kMa4Jw="
},
"eng-fin_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-fin_links.tsv.bz2",
- "hash": "sha256-Yn9gxc74PEmyZysHK/qMRyLGB2QQlXTFMJ8jhLXoD+c="
+ "hash": "sha256-8CC0q+Nk3wX8aXt6171LKAnZvycAMRd4xx6kwsiPma8="
},
"eng-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-rus_links.tsv.bz2",
- "hash": "sha256-0POD+BfslPOg3eKQSPlPrhMeS6TxYzWpYwV7gpVv9tE="
+ "hash": "sha256-zHIoh+JMhl84aBfUJbk8C4LSlTUY6ZBVnVU24/P+jKo="
},
"eng-ukr_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-ukr_links.tsv.bz2",
- "hash": "sha256-ck2bf45itM+K/nQbo7L2NOjyNsupWeGqJNShIRouSaM="
+ "hash": "sha256-ePV9qU0KFixmAmZ0d1joEJjcB0iEkYp23l6HEW4hr1M="
},
"epo-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/epo/epo-eng_links.tsv.bz2",
- "hash": "sha256-VFt38One2FpH/XFwTl97dlXHCMQ+pnWg5k7DgOwasK4="
+ "hash": "sha256-F+vhTcrhVSLJUOS2cMPHkGHbH6wLoPzj2waaxrcE5sY="
},
"epo-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/epo/epo-rus_links.tsv.bz2",
- "hash": "sha256-e3STWQudHbEo2BSnEgIsUIUuMmCgkVzJPdAAldTIFAI="
+ "hash": "sha256-pYvh508X39X2DU7zcRyLcCgSJpZTZU5CGmUWDIXlKo8="
},
"fin-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/fin/fin-eng_links.tsv.bz2",
- "hash": "sha256-+jo3TpKFW9Sx2hxvc1HD2vnGa4ArkrQbmdVJDZllckU="
+ "hash": "sha256-tQZXx1MB+s3RdxyYqtUDoL7J/L45y+VzDCfllch53hY="
},
"fin-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/fin/fin-rus_links.tsv.bz2",
- "hash": "sha256-epl1FdjToSd8aC6j1rzYiavPj9YWcMDWr/lv5L8rbaE="
+ "hash": "sha256-4ZV5GXV5so7W423NmQ98CDW3UfYWSvlDRBUQKw3lc1k="
},
"rus-deu_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-deu_links.tsv.bz2",
- "hash": "sha256-Tfd/1NewzS6A+sPgopplXCFP2e6l6Ns2GyffAVaViAo="
+ "hash": "sha256-lnZKiIypDn0DIKmFY6HojWxue+9RgN6IgmPe1ybAPow="
},
"rus-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-eng_links.tsv.bz2",
- "hash": "sha256-YbK7d6nY4e7g7CYo0BYZWsuPX4qPB6mbyiGxg4Z16UY="
+ "hash": "sha256-+/fT6E6dMkL4Qnht3cR4atGpvkUMNzTE1Gv8meP1rHU="
},
"rus-epo_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-epo_links.tsv.bz2",
- "hash": "sha256-AvQ22qKjDlptLRxJ2Whk+pJD193yCsFuZFOgQiHZcOE="
+ "hash": "sha256-lZy2ODGCpAQ//sjpgOvdIp9KB5swOYIBObENE9Efi0k="
},
"rus-fin_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-fin_links.tsv.bz2",
- "hash": "sha256-sdENtQSzkdoioMPzpeCR+67QQ4KiJQof82aUqU/GA8E="
+ "hash": "sha256-/LeA07wRI/Prj00AdjwLikmwIomwqc2bbSRIbDIu1s4="
},
"rus-ukr_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-ukr_links.tsv.bz2",
- "hash": "sha256-1TXeyhoU1l5djmmUcPUe4eRhXxgmhlSmaYDumv7hZ/A="
+ "hash": "sha256-Rs5/H0HfwhozEE/MoLjdsBVInIgKsolS/ClqbnjjCqU="
},
"ukr-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/ukr/ukr-eng_links.tsv.bz2",
- "hash": "sha256-bGbyxpkmkI/J+yrQaLapq8V0XLfoixXpNibZMRoNUzY="
+ "hash": "sha256-lAASo6qeqV81FlcliPjlM9wH9A+Egc/t+Utpexx/jkU="
},
"ukr-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/ukr/ukr-rus_links.tsv.bz2",
- "hash": "sha256-e+G+/kv7mqdgsaTjVuUzx0H5gNyNc4F+Hy3KdvSMEks="
+ "hash": "sha256-A/EHjHBPHzQLGSlLLC1D6B8SwGkaezdtc6b+cY5Zu0Q="
}
}
diff --git a/pkgs/data/dicts/tatoeba/update.sh b/pkgs/data/dicts/tatoeba/update.sh
@@ -0,0 +1,15 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p curl gnused nix-prefetch jq
+
+set -euo pipefail
+cd "$(dirname "$0")"
+
+version=`date -u -d "-$(( $(date -u +%w) + 1 )) days" +%Y-%m-%d`
+
+sed -i "s/version = \".*\"/version = \"$version\"/" default.nix
+
+cat tatoeba.json | jq -r '.[]|.url,.hash' | paste - - | while read -r url hash; do
+ newHash=$(nix-prefetch-url --type sha256 $url)
+ sriHash="$(nix hash to-sri --type sha256 $newHash)"
+ sed -i "s#$hash#$sriHash#" tatoeba.json
+done
diff --git a/pkgs/data/maps/maptourist/default.nix b/pkgs/data/maps/maptourist/default.nix
@@ -2,11 +2,11 @@
stdenvNoCC.mkDerivation rec {
pname = "maptourist";
- version = "2021-11-10";
+ version = "2021-11-12";
src = fetchurl {
url = "https://maptourist.org/osm-garmin/archive/OSM-MapTourist-szfo-RU_${version}.zip";
- hash = "sha256-2ICQy6+xnuVRPIulmPymDs1GJsHIJiWe0DpSwlxtw0I=";
+ hash = "sha256-ZLO6B+qxi0xp1lNi9joMsT+Br8zIHbPNVBw4jReNo7Q=";
};
sourceRoot = ".";
diff --git a/pkgs/linguistics/pytorchtext/default.nix b/pkgs/linguistics/pytorchtext/default.nix
@@ -40,6 +40,5 @@ python3Packages.buildPythonPackage rec {
inherit (src.meta) homepage;
license = licenses.bsd3;
maintainers = [ maintainers.sikmir ];
- broken = true; # https://github.com/NixOS/nixpkgs/pull/140626
};
}
