commit a974d443fda325967aeef07cdda639a4a0327be7
parent ef20f76f5f5ce7f61addeaf9188ca81579160e27
Author: Nikolay Korotkiy <sikmir@disroot.org>
Date: Sun, 30 Oct 2022 01:31:54 +0300
Up
Diffstat:
6 files changed, 39 insertions(+), 37 deletions(-)
diff --git a/flake.lock b/flake.lock
@@ -2,11 +2,11 @@
"nodes": {
"flake-utils": {
"locked": {
- "lastModified": 1659877975,
- "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
+ "lastModified": 1667077288,
+ "narHash": "sha256-bdC8sFNDpT0HK74u9fUkpbf1MEzVYJ+ka7NXCdgBoaA=",
"owner": "numtide",
"repo": "flake-utils",
- "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
+ "rev": "6ee9ebb6b1ee695d2cacc4faa053a7b9baa76817",
"type": "github"
},
"original": {
@@ -17,11 +17,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1666926733,
- "narHash": "sha256-+gYfOEnQVISPDRNoWm2VJD5OEuTUySt48RchLpvm61o=",
+ "lastModified": 1667055375,
+ "narHash": "sha256-xfSTHYxuKRiqF4dcuAFdti1OUvrC2lHpQqCHWUK5/JA=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "f44ba1be526c8da9e79a5759feca2365204003f6",
+ "rev": "7f9be6a505a31f88499c5d20d11f98accf5ae6ba",
"type": "github"
},
"original": {
diff --git a/pkgs/data/dicts/tatoeba/default.nix b/pkgs/data/dicts/tatoeba/default.nix
@@ -28,7 +28,7 @@ let
in
stdenvNoCC.mkDerivation rec {
pname = "tatoeba";
- version = "2022-10-15";
+ version = "2022-10-22";
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,75 +1,75 @@
{
"deu_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/deu/deu_sentences_detailed.tsv.bz2",
- "hash": "sha256-JHqmDPBjg6xZkBjQpfImUXantEcL9+BCZ9g7kg3ppto="
+ "hash": "sha256-FHpDIiIZgmN374vqyiNp28HWgZm+ejZn40B/F78nD1Y="
},
"eng_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng_sentences_detailed.tsv.bz2",
- "hash": "sha256-0tRjRBwDonzzAGVaJxFsaQV4HGZ4rHLMw+NmyLeCm1Q="
+ "hash": "sha256-WpLfFB+S64zWFmrRIhtrdUKrtgLhTZHQRO8EfLQtfV0="
},
"epo_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/epo/epo_sentences_detailed.tsv.bz2",
- "hash": "sha256-kPfGM/720RdfWb6UqigZA91IY/kgjqWsSUPO7hmiLmU="
+ "hash": "sha256-YoYscHWm5ofRoGM3/a7ehVOVIXuEte2YyhcKMRsdBSQ="
},
"fin_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/fin/fin_sentences_detailed.tsv.bz2",
- "hash": "sha256-Q91mkbMCrbUjb3Q7Cwnd5bWMRCRAw0PBmtm4KoO2P6A="
+ "hash": "sha256-oh0CKkOj4EU9y66TAmnvb5g0jPDALyQYcHxJwziiUNs="
},
"rus_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus_sentences_detailed.tsv.bz2",
- "hash": "sha256-GEMqbHSWqfUWHA6caE3O5h6is/VPsNnaBqX25ZNwYfI="
+ "hash": "sha256-hFbi3nAj4+G5SikzTD6IlL3bk9YPaVD2f+7TJy8QeS4="
},
"swe_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/swe/swe_sentences_detailed.tsv.bz2",
- "hash": "sha256-oRbrfw9QsudFwqeZDK4i6mHZGfHb0Cyhf6KNO8NJDd8="
+ "hash": "sha256-ExJCyPquhiIbopOk5LuCNewIVm1lIGCPceJnlXRkJsE="
},
"ukr_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/ukr/ukr_sentences_detailed.tsv.bz2",
- "hash": "sha256-tdhYONmqIxppv7LQCgLIZGs9hRiyMhZq4lXEc6zmZyw="
+ "hash": "sha256-MM3+O6Kj2YlfXXBG5v5NQanH4P84l1gvdwb1Y8z5FOE="
},
"deu-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/deu/deu-eng_links.tsv.bz2",
- "hash": "sha256-quOg+PZ1IMZReKV1ROT5JJygosLfgvHL5FGCqtePR8I="
+ "hash": "sha256-W1zwoM+kpl3AEfdFzUsdHdZWDZw8sReV5FaDqndFoC8="
},
"deu-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/deu/deu-rus_links.tsv.bz2",
- "hash": "sha256-ZVTjshaCF5Ujov6EGvZKqyk7k8glWnuWAXSTAeqYkuI="
+ "hash": "sha256-6wuxgLhTxvD4er0nJHtCqqen1cUrIbluuBr+FFp+5iI="
},
"eng-epo_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-epo_links.tsv.bz2",
- "hash": "sha256-UOtUCUz0fmQse2XY8SVr7YQQKXOPP2rnGQz+YuX5b0w="
+ "hash": "sha256-NcR5acSKjGon1EYlZwHcgjY2fDomF14CnjDOAMTO+C4="
},
"eng-deu_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-deu_links.tsv.bz2",
- "hash": "sha256-ldHQhBeYn8VuQOo9ssVW27oCNc1hUP1162f5Ne8WDMA="
+ "hash": "sha256-DO7NLHvD8YxnDsrSvPfNV8o3gZO2ykIykEBjhD4Y/2Q="
},
"eng-fin_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-fin_links.tsv.bz2",
- "hash": "sha256-U84PUajvNv4Oe9STdTVqntWn5yjY9SjWef4UiBlg8y8="
+ "hash": "sha256-85wG6t86Qfaw6M69a+/11558WzZy3lUZk/Sv39+VT1c="
},
"eng-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-rus_links.tsv.bz2",
- "hash": "sha256-hCDxBbLghiipMVYfSI2IQic9ce3VGBxIiFvZTmp7ZPU="
+ "hash": "sha256-kdoRnFA07Q/f5sAPCs+ljPPTlf+3HhauOyb1qcxghek="
},
"eng-swe_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-swe_links.tsv.bz2",
- "hash": "sha256-0m9xfZDROLP1QoK3MYc42WNjfIEl9x0GcB++VlZ5A1I="
+ "hash": "sha256-pJRLcE5fOOADiS+58uY88VMm3bZdaqUyETZ4Z34rerE="
},
"eng-ukr_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-ukr_links.tsv.bz2",
- "hash": "sha256-QPzXdGRDeIP1wwxi0a9L2GoYNjtOL1QVzQV6OTmVLyE="
+ "hash": "sha256-PYQT82HcSqCJCIHHoYuYA+ku2K5Cxr28iwb6WzJWJl0="
},
"epo-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/epo/epo-eng_links.tsv.bz2",
- "hash": "sha256-WK15iGjpazsSQRVBjdH67w1YQ3L43X8Nd53NhwWECeU="
+ "hash": "sha256-QvXJJ3jQNITH4Es+1Momeh6Pgbi9RGhttTGJbv60p9s="
},
"epo-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/epo/epo-rus_links.tsv.bz2",
- "hash": "sha256-aA7H0xTbH6WEa02AkEkdcDTrNw06ErdTo5eBwcWmuLI="
+ "hash": "sha256-zfm/7IdDsX8lX3RDSD4JWj1ZxbmKWUXiPttYeZvHXdo="
},
"fin-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/fin/fin-eng_links.tsv.bz2",
- "hash": "sha256-HoozswsAk4SbUytYW2HPFTpG2nJdwOVic0oFP/YJPFk="
+ "hash": "sha256-OgwbRPRGOvNEOmUZa9tDy1vxIWrmjTaLX1J3oY604rs="
},
"fin-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/fin/fin-rus_links.tsv.bz2",
@@ -77,15 +77,15 @@
},
"rus-deu_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-deu_links.tsv.bz2",
- "hash": "sha256-sNjvhRNrumOqqO5l7aelB+2KSmIRRZrD/2h8ZKWEESg="
+ "hash": "sha256-TuXHOhqDHAO6AwVH/yvu5djd17cPCirIosjEqTMa5Dc="
},
"rus-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-eng_links.tsv.bz2",
- "hash": "sha256-KDxhocaV9eyjxVO//+z94zJOeAKyEbhOv/xH2DLz86o="
+ "hash": "sha256-u1InDaEJMQHG+S5a1vk+WXRicGUI3GOFaCeiNg8vLyA="
},
"rus-epo_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-epo_links.tsv.bz2",
- "hash": "sha256-DminqY7c/sA+5+WRmo6u+BZL41dXCRXpDirk0vruyVc="
+ "hash": "sha256-eQsAKlgrDy36B1Wt32xMtpTBVR9ZZ6uO35ploEH5iyY="
},
"rus-fin_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-fin_links.tsv.bz2",
@@ -93,26 +93,26 @@
},
"rus-swe_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-swe_links.tsv.bz2",
- "hash": "sha256-VfVouKfFESy4PfAz474V2tW0wcvWkNda1xqhuA/DWFY="
+ "hash": "sha256-mSaNnURZ2QGZ9CeF7kPAdXIZCG6GZYADmP7VjHM9vVM="
},
"rus-ukr_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-ukr_links.tsv.bz2",
- "hash": "sha256-KIOslmCxSUGNxo/RaPYkWDh7tP+JFzNqNtIqJEQvzUk="
+ "hash": "sha256-zVZSRXMdPPPMYWp6PrQz+VX+wuPP2TSoscG8QSLH5y8="
},
"swe-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/swe/swe-eng_links.tsv.bz2",
- "hash": "sha256-h4AKZMMTQJEtmTipHo6sOpf78EeVhQa411iDywARjzw="
+ "hash": "sha256-Us5VSHV4GYsta4hh8+AhM2Rmo7tBjJKRQReAYD5qeG4="
},
"swe-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/swe/swe-rus_links.tsv.bz2",
- "hash": "sha256-tSV9LH03hwS1H+ospMURbgFXt33TKSdH6g2rIF4jtMc="
+ "hash": "sha256-geDQTGFU2Egwp3L/10UWEgopBYKgoln8JDweGb0d+9Q="
},
"ukr-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/ukr/ukr-eng_links.tsv.bz2",
- "hash": "sha256-nyI4k2k2RiHaaKI8Lbnl9g1CmoNC666MlOrgZDLQQ5g="
+ "hash": "sha256-Ofb7y5c4Yh6lJerXlH/h3asnL5z5KhD+KQBRUUtbrhA="
},
"ukr-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/ukr/ukr-rus_links.tsv.bz2",
- "hash": "sha256-7pfPMCSbcnLY2b+Nm9ZDKZ+rrFdojqJN0lIGNuLr3eI="
+ "hash": "sha256-SvfQ0oSatfK43arh5cT863cQhPGeoFexv3ObIZInoPw="
}
}
diff --git a/pkgs/data/dicts/tatoeba/update.sh b/pkgs/data/dicts/tatoeba/update.sh
@@ -1,5 +1,5 @@
#!/usr/bin/env nix-shell
-#!nix-shell -i bash -p curl gnused nix-prefetch jq
+#!nix-shell -i bash -p coreutils curl gnused nix-prefetch jq
set -euo pipefail
cd "$(dirname "$0")"
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 = "220918";
+ version = "221028";
src = fetchurl {
url = "https://download.geofabrik.de/russia/northwestern-fed-district-${version}.osm.pbf";
- hash = "sha256-XMx3VcRGzX25lc3IKNi5Gn9t8ZTN2i1yeDrp1dIGBHI=";
+ hash = "sha256-3N8++FXVRHG3pryZcRa8B4Ey+blBFJ5f2IGqe+M/QZQ=";
};
dontUnpack = true;
diff --git a/pkgs/osm/pyrobuf/default.nix b/pkgs/osm/pyrobuf/default.nix
@@ -17,6 +17,8 @@ python3Packages.buildPythonPackage rec {
checkInputs = with python3Packages; [ pytestCheckHook ];
+ doCheck = false;
+
meta = with lib; {
description = "A Cython based protobuf compiler";
inherit (src.meta) homepage;
