commit 8778d81a533729d44b5ca3988187bfaee897feea
parent d773df92e03c42bf8f34ff5689a0d809310e81c5
Author: Nikolay Korotkiy <sikmir@disroot.org>
Date: Wed, 4 May 2022 02:33:18 +0300
Up
Diffstat:
5 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/flake.lock b/flake.lock
@@ -17,11 +17,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1650792148,
- "narHash": "sha256-n1MZSZIzvP70BJ56tV8GwQ5L0wHt/nTH9UkF5HTGB/4=",
+ "lastModified": 1651545648,
+ "narHash": "sha256-7f1JYFHtfTOvois5LdXrKXthjb6rE9i8ZxWDQyzYKAk=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "ab83c5d70528f1edc7080dead3a5dee61797b3ff",
+ "rev": "24c33ab7952544ad355d0677c9eea931b23f371c",
"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-04-23";
+ version = "2022-04-30";
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-NDmCH8XWSDj3XlSLaXbjj7y05FZIAfyWO4Ar/zAczBo="
+ "hash": "sha256-dON8crAhEQr09upxOea0xh9hLdU8m1ifHcXH/qZFwQE="
},
"eng_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng_sentences_detailed.tsv.bz2",
- "hash": "sha256-9AWNPMmpHEFv32NQvDuzXhiMz03DbGZclxsY6ka0Avs="
+ "hash": "sha256-fudEm9rvjdbFuuLUFypaYJJNP86mLu22jbNBW0GRmuk="
},
"epo_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/epo/epo_sentences_detailed.tsv.bz2",
- "hash": "sha256-PpZX903a8zXFaTR0ACm7Ye1VTWMyw7h07Xu99Ka7Klg="
+ "hash": "sha256-uC2mAkNdv35DEPyLPyj0wua5xT6ULG8REFo8M0kKJVs="
},
"fin_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/fin/fin_sentences_detailed.tsv.bz2",
- "hash": "sha256-fzIx8kr+7h45iY0yPZ4Etl3MmVifompFvM1Cod5NPyU="
+ "hash": "sha256-bPAC1L2RABugYwS5qpBZSa1df+YCTUMY3/pHCg2fRmM="
},
"rus_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus_sentences_detailed.tsv.bz2",
- "hash": "sha256-ZWU6joW47vPtGbqxPsl3anFUBP6J5W60NxnomYglHI8="
+ "hash": "sha256-3WgIqx9ALCpJN8r0jp3tUG6QoS2AcvhNei67F1xdo0U="
},
"swe_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/swe/swe_sentences_detailed.tsv.bz2",
- "hash": "sha256-5AE+3nV5+RkRP0mdKpLs0dPwD7hODMJkIwOB4SpH4AM="
+ "hash": "sha256-ZE7BFInTIcLbwU9R/L4HeWh9A1P2lVC/p8orv+3Mm44="
},
"ukr_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/ukr/ukr_sentences_detailed.tsv.bz2",
- "hash": "sha256-T0F6SiCutKSNLzV+T3F6Fwx4WbmbqZrjF76v5ebNixM="
+ "hash": "sha256-fCyDE4GOMqxkw78VIFhsrIGp2kT2ebl2EvUTKEP5T80="
},
"deu-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/deu/deu-eng_links.tsv.bz2",
- "hash": "sha256-ULhvGpHOOFUB7Dylvo4Ct9FrvwcOGu6GVDaNTmg/e6c="
+ "hash": "sha256-Ssefz8r4uKp+bV8EwUZ70WroGQJPRS+VVXot6YMKCMw="
},
"deu-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/deu/deu-rus_links.tsv.bz2",
- "hash": "sha256-f4br62smT5dYlw4fbSB2rR5xUcDYcUdbiqrF2S2f1Uc="
+ "hash": "sha256-3VS7exY+4Gnb/YMeBMhK2ngtnscqIRW3G7d0T76G7/A="
},
"eng-epo_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-epo_links.tsv.bz2",
- "hash": "sha256-fzJafluNmUqYQTJHA8FFEcENKUdcGv5MC9kmml21OEo="
+ "hash": "sha256-1cx7vXiT++kY5wU4CD0PC/JMAeUJybNpZHCJMSIhVLI="
},
"eng-deu_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-deu_links.tsv.bz2",
- "hash": "sha256-uIg5jRD0UHdbhL08U3mZksMeYMCzZTUUTrpn76eVAV8="
+ "hash": "sha256-DaYTD8B2EPmIF1SZ2a9ItOm4su+rPrCKte4IM6N9/oM="
},
"eng-fin_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-fin_links.tsv.bz2",
- "hash": "sha256-fMGPqwIOI/niGpJJwEzxfBDzrKetdZuzPVIrSMz3nX8="
+ "hash": "sha256-T1NO+vGY8RhRJhdruTdWX+OWIpwP7RQcLIa3kprS4Pw="
},
"eng-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-rus_links.tsv.bz2",
- "hash": "sha256-ExybedtZmD9VIVlatKZH96wph45bX00gk1XMe/Gy6WE="
+ "hash": "sha256-AbF1dxtxqsSMzorbXUHCVAyoniKfphezI8MaK9RY1bU="
},
"eng-swe_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-swe_links.tsv.bz2",
- "hash": "sha256-xyA6SZE+D3V85pnxr2NHAtmjLIYpl1NvRnOAzerPfJI="
+ "hash": "sha256-7lxXD6ZcDza8UIfo7qT1n4VbeC4aC/BOifgtoTZrHLQ="
},
"eng-ukr_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-ukr_links.tsv.bz2",
- "hash": "sha256-Poek3LN7yu78v5mxcVd6xq3ZMBrlAKVjWyMY8Y3ZTss="
+ "hash": "sha256-hulv2lHPHEll7quOjBCvTYF7noQPHMCqVGQp3yvZOVE="
},
"epo-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/epo/epo-eng_links.tsv.bz2",
- "hash": "sha256-DLyW8BlJgZvvnZRsebv0wpoytLpAZkIdV+WnoG34oQ0="
+ "hash": "sha256-V0JRX1a3St9xA8qhncBWSmk0N1Rab+nz166d8VZ2+5U="
},
"epo-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/epo/epo-rus_links.tsv.bz2",
- "hash": "sha256-gAPTfY+ZGOa2zQnGFost3LdafmEzTdlPXudUCOtiHUE="
+ "hash": "sha256-lDXmHj8AZUZck+JnqOmuk6JYnQKH8dhvwHLqqhe9Ptg="
},
"fin-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/fin/fin-eng_links.tsv.bz2",
- "hash": "sha256-rJ4q5lYuSuL0Zj5Tl+TPWcu4UiHl6DKNkm0McaDutyo="
+ "hash": "sha256-q//alR1GM/Q8ayrTbsW0gT8hrFM4BPLoKY5ZD6JquAk="
},
"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-HgEBEXMXveqt7mrwRbJcvBgHKtomnrjzILFRSpW3qCg="
+ "hash": "sha256-Ag9mExKNnrD+EZr1Am8zSGNvMmDy6pmdyIi9Znprs7w="
},
"rus-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-eng_links.tsv.bz2",
- "hash": "sha256-NZjasXWcmq81L0u6HCF0YXZXVI6skKenrZKCnImR8to="
+ "hash": "sha256-eQKXS26zlo8/AbloTHQ7PeHezmw4WQQXdMGBFWYRS+U="
},
"rus-epo_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-epo_links.tsv.bz2",
- "hash": "sha256-/6WWC4BzOHq9cpzx9k0b+A7SjjktEnwASyYW6Xw4q0E="
+ "hash": "sha256-Nu4hm8bfTb57hsVqHbFO0lKHla+8OqVC3/rRLuRRNqI="
},
"rus-fin_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-fin_links.tsv.bz2",
@@ -97,11 +97,11 @@
},
"rus-ukr_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-ukr_links.tsv.bz2",
- "hash": "sha256-zrlmptpicepVxc++V0m+8JBxtAOfue+QdOSTS6bfmt0="
+ "hash": "sha256-asWp9Nauy8PsbyJ2Okbq32EE1a+Zwy/Tt/D1uFWt6jY="
},
"swe-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/swe/swe-eng_links.tsv.bz2",
- "hash": "sha256-4w4FCUEcU1gtKVK2xshMcp6uFA8TuFclxo4seO5fC1g="
+ "hash": "sha256-f7AyH3P0nm88rhPREJJDMUuQYCOCxe+v5igmJEpwc6I="
},
"swe-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/swe/swe-rus_links.tsv.bz2",
@@ -109,10 +109,10 @@
},
"ukr-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/ukr/ukr-eng_links.tsv.bz2",
- "hash": "sha256-icKGgiHygU3TVm7YbJT9lL80aRTWTHdkazIhoMkQniA="
+ "hash": "sha256-vg9hsza92r+kS6bfPrfBx96PwdJCA3OG6kYv5sZunKc="
},
"ukr-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/ukr/ukr-rus_links.tsv.bz2",
- "hash": "sha256-maYxyXqndWvixDpP3l5j0h4AMno3HpTad9hVTSS5Pkc="
+ "hash": "sha256-QI1ZLN7RArv4pjoF00Cu3uRm39f6Vhvfp1/cwcXbcwg="
}
}
diff --git a/pkgs/data/misc/routinodb/default.nix b/pkgs/data/misc/routinodb/default.nix
@@ -2,20 +2,20 @@
stdenv.mkDerivation rec {
pname = "routinodb";
- version = "220423";
+ version = "220502";
srcs = [
(fetchurl {
url = "https://download.geofabrik.de/europe/finland-${version}.osm.pbf";
- hash = "sha256-my7RLXL8+wqRvhV3M0CNdRgc/Q8vvkMxa6glxhUn8Hc=";
+ hash = "sha256-VWXm4gwL2QJfoFQ6lyc7rIuUmkBSMnM+UvE1zLVkhy4=";
})
(fetchurl {
url = "https://download.geofabrik.de/europe/estonia-${version}.osm.pbf";
- hash = "sha256-h+M1sY1p/Lw5jgt1BtkBiC1qH5Uj5ESHyIJ6M8sBgmk=";
+ hash = "sha256-6Dhotvcz80xnjLyiMd0pDCPdRrPjZ3r8+f7iYluK/fc=";
})
(fetchurl {
url = "https://download.geofabrik.de/russia/northwestern-fed-district-${version}.osm.pbf";
- hash = "sha256-5IyB8iaGUTAErYusIunGNE7W3zatSEEiWNPzs8eClC0=";
+ hash = "sha256-cWdAPUh3dFPwyULFVrYhZs/WDwKKRVOr9eMyLEFLE8Q=";
})
];
diff --git a/pkgs/misc/ascii-dash/default.nix b/pkgs/misc/ascii-dash/default.nix
@@ -24,8 +24,8 @@ stdenv.mkDerivation rec {
buildInputs = [ ncurses5 SDL SDL_mixer ];
- NIX_CFLAGS_COMPILE = lib.optional stdenv.cc.isGNU "-Wno-error=stringop-truncation"
- ++ lib.optional stdenv.cc.isClang "-Wno-error=mismatched-new-delete";
+ NIX_CFLAGS_COMPILE = [ "-Wno-error=mismatched-new-delete" ]
+ ++ lib.optional stdenv.cc.isGNU "-Wno-error=stringop-truncation";
installPhase = ''
install -Dm755 main $out/bin/ascii-dash
