commit b4fb5301d41a1bb5ee0eff1219f93ff24452bdc9
parent dd8c446d5e6ae324f98ab050d86aa4cf0aa0e97f
Author: Nikolay Korotkiy <sikmir@disroot.org>
Date: Sun, 24 Nov 2024 00:50:00 +0400
Up
Diffstat:
6 files changed, 38 insertions(+), 39 deletions(-)
diff --git a/flake.lock b/flake.lock
@@ -20,11 +20,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1731531548,
- "narHash": "sha256-sz8/v17enkYmfpgeeuyzniGJU0QQBfmAjlemAUYhfy8=",
+ "lastModified": 1731890469,
+ "narHash": "sha256-D1FNZ70NmQEwNxpSSdTXCSklBH1z2isPR84J6DQrJGs=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "24f0d4acd634792badd6470134c387a3b039dace",
+ "rev": "5083ec887760adfe12af64830a66807423a859a7",
"type": "github"
},
"original": {
diff --git a/pkgs/darwin/zed/default.nix b/pkgs/darwin/zed/default.nix
@@ -7,11 +7,11 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "zed";
- version = "0.163.0-pre";
+ version = "0.163.2-pre";
src = fetchurl {
url = "https://zed.dev/api/releases/stable/${finalAttrs.version}/Zed.dmg";
- hash = "sha256-JrRygChbC9JDBztSBUKiS9XyUghLrY+oucqlNucSJys=";
+ hash = "sha256-fZd2H8XFW/rIEik9tcrnPrtaGvmM4rB06GA/nSYLDx0=";
};
sourceRoot = ".";
diff --git a/pkgs/data/dicts/tatoeba/tatoeba.json b/pkgs/data/dicts/tatoeba/tatoeba.json
@@ -5,27 +5,27 @@
},
"deu_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/deu/deu_sentences_detailed.tsv.bz2",
- "hash": "sha256-+JBm8p/ZTyQgv3ca67T2g1TygU3t7D71N6AlE08ZdTI="
+ "hash": "sha256-eNs4+Fs22XgoweM7Ho+ooWr4yDuAI7yW52bv6YgWWRc="
},
"eng_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng_sentences_detailed.tsv.bz2",
- "hash": "sha256-UbSZ3TRm9MS7edrEowybIfd7kaOQ48ZIaSFH9qtY3g8="
+ "hash": "sha256-2cgOonK5lsgWxgaPlbOONs/WM7Tm/7mdDsDbeh1yQHg="
},
"epo_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/epo/epo_sentences_detailed.tsv.bz2",
- "hash": "sha256-lu57cRmeufwSb6zVKiOk9oEj8n9O9F/jjgjoMisWzqU="
+ "hash": "sha256-8b3BXh/NypP71/zNiYeg9okblrZElUPIR73EXGgcjeI="
},
"fin_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/fin/fin_sentences_detailed.tsv.bz2",
- "hash": "sha256-JEUj5h5kZQk4gUwLGGaom7+fZKP6h4LuBWrx+xRVRlg="
+ "hash": "sha256-tmzxKNxx8wZM29MlpgvavG71cj3KtDLFbae8x7+znYM="
},
"hye_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/hye/hye_sentences_detailed.tsv.bz2",
- "hash": "sha256-wXjx/ZrBXo6g0djL+1AqDWuL3jCys4r8yqSKGpyiWhE="
+ "hash": "sha256-QK8T8hVz41OERQmHqVQa6ZVIIrdKTv9u1/SASo8PsfA="
},
"rus_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus_sentences_detailed.tsv.bz2",
- "hash": "sha256-KM0ww7AjfE6Cdq4KykOjeIEd/+jUCHW9huvQ5SkNXCM="
+ "hash": "sha256-2cs1v+abKSG+KvvLtBNt+nqQ0X4cwHEyOTjr0+maAUk="
},
"swe_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/swe/swe_sentences_detailed.tsv.bz2",
@@ -33,7 +33,7 @@
},
"ukr_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/ukr/ukr_sentences_detailed.tsv.bz2",
- "hash": "sha256-cBC+SVq50mQlV7tVbRZJK0My5qT5OUU5C2mKUPfBr7Y="
+ "hash": "sha256-l6XuzMB8WuHbM7K0m+dNtWuCg1vlHX60Hzu2G42tRYM="
},
"bel-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/bel/bel-eng_links.tsv.bz2",
@@ -45,15 +45,15 @@
},
"deu-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/deu/deu-eng_links.tsv.bz2",
- "hash": "sha256-o5ulK7U3puuCnY6MYLpyqhz5MFb4DFGMccZPReAJyZI="
+ "hash": "sha256-/sGolLSsuDGCWvtMljNcsMrqYEXK0p/7aZZDua1wIu0="
},
"deu-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/deu/deu-rus_links.tsv.bz2",
- "hash": "sha256-7S28Z6Rj7EX+Jc+sv5a+mJFK61aeGsyG8u89XoU+EvM="
+ "hash": "sha256-K2iH2hU5iUWvRKILWYzWiDvFdt5TMTgQBvWefpIkaXw="
},
"eng-epo_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-epo_links.tsv.bz2",
- "hash": "sha256-V6jgnj4Pa7NXHECbhveyYIk4G5mUl4TryxNvhz3lsU8="
+ "hash": "sha256-SviMDdgr+S4QvzyajhMdU6cvewoSaIszcYDXc8EWqSw="
},
"eng-bel_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-bel_links.tsv.bz2",
@@ -61,39 +61,39 @@
},
"eng-deu_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-deu_links.tsv.bz2",
- "hash": "sha256-QUK/ITHXNNRWkAsz2kmRyC4XUbTUN1KewVh1MsFRtF4="
+ "hash": "sha256-2R1L/A+fclOgF9QUTe1yz0NfBip8bqfHnzX/sbD3RwM="
},
"eng-fin_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-fin_links.tsv.bz2",
- "hash": "sha256-c6KSDOdj0w3uTGnNQV/VL6Hola4krXAs1IBo289zSQ0="
+ "hash": "sha256-xpX34w7lUWQnUYHHgmJeNTavU9yrz+s2OU4XbPqxVsg="
},
"eng-hye_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-hye_links.tsv.bz2",
- "hash": "sha256-z/cWg+BpIAWbECmqCjKhJjwNJKiE2dLBgQtjduwBcv8="
+ "hash": "sha256-80FNg0L+71PLkQrt340yNEwjgxcTCo7/iDg/CD521vQ="
},
"eng-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-rus_links.tsv.bz2",
- "hash": "sha256-QUJY7fFsOML8qoaprU/Ehj0xeG6w5TpSErVIqjvMQfI="
+ "hash": "sha256-CW/8mKdp4XudGHeVTgr1TuA7YDzZExUGRZopZQhwE4E="
},
"eng-swe_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-swe_links.tsv.bz2",
- "hash": "sha256-giNrQBBKzmOG0Xlj9vNvLwVPOjiWXCW6b0QcLXkboa4="
+ "hash": "sha256-6XNrnROkpIs4SHcrx8jmPbIbg942uTNhCpxQXeXJnho="
},
"eng-ukr_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-ukr_links.tsv.bz2",
- "hash": "sha256-AAp4IgnPjDd3+Q+WSCmsVMb3g2l+Qsyftg72MSzvoBA="
+ "hash": "sha256-ukbgHCnHnPA51GG7PjEdnaRzmglOdzAY42Bnl7cAq8s="
},
"epo-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/epo/epo-eng_links.tsv.bz2",
- "hash": "sha256-mMAerjc9mCBE8lgnDiaiEQ/1tovXhD9EBiCP0FLzwbg="
+ "hash": "sha256-fqKMCV9AJwQw28wdazmfgnFiaoGx2/CmERnUWkdbCsY="
},
"epo-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/epo/epo-rus_links.tsv.bz2",
- "hash": "sha256-rCGJcsU4DUV4MUYNBhWUFJ/Oxr6ljSzlq0xiWzWTf9I="
+ "hash": "sha256-yUaTzdIM2GUVwZHDLt2QzpeH77nG/LIVxaisNiMdOJc="
},
"fin-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/fin/fin-eng_links.tsv.bz2",
- "hash": "sha256-sxXTmBXBe9Y9k6RfR3ycQ0UL4E+sWdAQ8isvKFRRUIo="
+ "hash": "sha256-DdlyF3/pECMe+daBvxfUO3UdHHNBguFhdEjE/aRtuSg="
},
"fin-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/fin/fin-rus_links.tsv.bz2",
@@ -101,11 +101,11 @@
},
"hye-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/hye/hye-eng_links.tsv.bz2",
- "hash": "sha256-5Ox3FUkWL6C16tVrMsRlMMGt0HToRA2r9TER0sB/2UI="
+ "hash": "sha256-uoVPBeCvQ5GlMpFz73zqjh9MTy8sBTx+THf63Fz2xOY="
},
"hye-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/hye/hye-rus_links.tsv.bz2",
- "hash": "sha256-lhGy8z9g59ySQwnz/GoKfhE8/ibL8UToZGmakp6DYBw="
+ "hash": "sha256-mQsrSXRXABjd+2B7uLGBxk3uQ6PfGd/YnEa3HOA5B4M="
},
"rus-bel_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-bel_links.tsv.bz2",
@@ -113,15 +113,15 @@
},
"rus-deu_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-deu_links.tsv.bz2",
- "hash": "sha256-24QZLzetOHV4xScjzwBRep5FsUZ8PXtU9zxAK5WgKCc="
+ "hash": "sha256-d54RiO/uZbEErHRd5qgV64xQhWvYELVyoxSpWA/rPSo="
},
"rus-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-eng_links.tsv.bz2",
- "hash": "sha256-bgnSM9a11CFhntIrZFdtf+YuSU1EuXy8Q7Z9pi7z068="
+ "hash": "sha256-z6Umy43kmnN/0vnjcB5z668Kk8lOUf7/yzXWR13k4ZY="
},
"rus-epo_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-epo_links.tsv.bz2",
- "hash": "sha256-gbv0+5pVPm8tGU2JH9z6Jh4vQQcGaIoYv570oztKk2A="
+ "hash": "sha256-Af0rPzo4bwc/AhRYV5guckVxVTPDvDpvLqbtm+ChqYw="
},
"rus-fin_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-fin_links.tsv.bz2",
@@ -129,7 +129,7 @@
},
"rus-hye_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-hye_links.tsv.bz2",
- "hash": "sha256-ppOU7C5tqLyD9EPjSxzUOttYcf6ue/kLzr/qMjEHDuk="
+ "hash": "sha256-hbiLtM4bghiXeFWe0pGdK88nUMyFbKqoGW6iMNMsWEk="
},
"rus-swe_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-swe_links.tsv.bz2",
@@ -137,11 +137,11 @@
},
"rus-ukr_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-ukr_links.tsv.bz2",
- "hash": "sha256-Qr85kzdYDknHUX0K665Or7gM3BPVJ6KXBjlkJlqZNvg="
+ "hash": "sha256-49HC86XrgHR3QSqXLnKTHpS5UGINIh/CHBla1m8wciw="
},
"swe-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/swe/swe-eng_links.tsv.bz2",
- "hash": "sha256-Xp8ce3FiIT1nLDKqU82/Vy60q2z7cqacgOFGVK+DJGU="
+ "hash": "sha256-OgiOzvDFqjMDxvYKKoYozEYTSObiN0f25SrOxJR4hT0="
},
"swe-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/swe/swe-rus_links.tsv.bz2",
@@ -149,10 +149,10 @@
},
"ukr-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/ukr/ukr-eng_links.tsv.bz2",
- "hash": "sha256-csnus7/WeP5nG0zxrezgbXVVNsE0X9BOkCY504rpkU0="
+ "hash": "sha256-tYwPXb09vDB/RpdQT0Zbamz7XtzKSyBZDHngJg1//n4="
},
"ukr-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/ukr/ukr-rus_links.tsv.bz2",
- "hash": "sha256-D+rt9lFQe5ykYLHz6r+RtNEsIl1NKFPzlL/9zHX269A="
+ "hash": "sha256-X847aKkcj2stA6K/zkb2FgZEOoVl/jfPJofIr+O2Guc="
}
}
diff --git a/pkgs/data/dicts/tatoeba/update.sh b/pkgs/data/dicts/tatoeba/update.sh
@@ -11,6 +11,6 @@ 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)"
+ sriHash="$(nix hash convert --hash-algo sha256 --to sri $newHash)"
sed -i "s#$hash#$sriHash#" tatoeba.json
done
diff --git a/pkgs/data/maps/opentopomap/default.nix b/pkgs/data/maps/opentopomap/default.nix
@@ -8,7 +8,7 @@
mkgmap-splitter,
}:
let
- version = "241115";
+ version = "241122";
bounds = fetchurl {
url = "https://www.thkukuk.de/osm/data/bounds-20241025.zip";
hash = "sha256-7VjO9EYVQ0IEmjR3SXxaTAT22zToHw9JPOVm0p5rF3M=";
@@ -19,7 +19,7 @@ let
};
armenia = fetchurl {
url = "https://download.geofabrik.de/asia/armenia-${version}.osm.pbf";
- hash = "sha256-CI7D+YS8TPWR8EIOJROnFfUYeZZs48PYeJCd0t5vgDA=";
+ hash = "sha256-jRXbKIul8wUwWdX9FWBR3VUf4doZGukdTbyPR6bbXa0=";
};
in
stdenv.mkDerivation (finalAttrs: {
diff --git a/pkgs/linguistics/pytorchtext/default.nix b/pkgs/linguistics/pytorchtext/default.nix
@@ -51,7 +51,6 @@ python3Packages.buildPythonPackage rec {
homepage = "https://github.com/pytorch/text";
license = lib.licenses.bsd3;
maintainers = [ lib.maintainers.sikmir ];
- #broken = stdenv.isDarwin; # https://github.com/NixOS/nixpkgs/issues/94241
- broken = true; # sentry-sdk
+ broken = stdenv.isDarwin;
};
}
