commit 8796089011eeb594daf93506ee64a3185094b499
parent f0fbce66667cab3b07f89d8fe25ad866ee3c4b86
Author: Nikolay Korotkiy <sikmir@disroot.org>
Date: Sat, 1 Apr 2023 18:47:34 +0400
Up
Diffstat:
5 files changed, 40 insertions(+), 42 deletions(-)
diff --git a/flake.lock b/flake.lock
@@ -17,11 +17,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1679793451,
- "narHash": "sha256-JafTtgMDATE8dZOImBhWMA9RCn9AP8FVOpN+9K/tTlg=",
+ "lastModified": 1680273054,
+ "narHash": "sha256-Bs6/5LpvYp379qVqGt9mXxxx9GSE789k3oFc+OAL07M=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "0cd51a933d91078775b300cf0f29aa3495231aa2",
+ "rev": "3364b5b117f65fe1ce65a3cdd5612a078a3b31e3",
"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-03-25";
+ version = "2023-04-01";
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,55 +1,55 @@
{
"deu_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/deu/deu_sentences_detailed.tsv.bz2",
- "hash": "sha256-BTOo7DL5wvD8XhcRU90A/B80SFwaRA9Xgfh7BGbfHCQ="
+ "hash": "sha256-qbYuA7oUS9tLb7k/VstDof/6nygR3KTxX9SVtI2DdRs="
},
"eng_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng_sentences_detailed.tsv.bz2",
- "hash": "sha256-U8C1+ok8uWaRCHaoFGLcQEDpob/5Z/7O5jHbI1q9cnA="
+ "hash": "sha256-cBO9F4DG+yVJ5vi5kE1uPsO1BOlItoLi5hUZH6DOL9U="
},
"epo_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/epo/epo_sentences_detailed.tsv.bz2",
- "hash": "sha256-hoZNGyu7WQpDgYilV54h0sa1oGrqdk63UmZPpFPSmLY="
+ "hash": "sha256-xTThyaJwdHD6AxbAI29fgAhewUosSLGEAPmOXiPUfd0="
},
"fin_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/fin/fin_sentences_detailed.tsv.bz2",
- "hash": "sha256-Wr4gzaXgtqcC5GjAUHDsG6bohw/QRTWaZjV2gOkZUKg="
+ "hash": "sha256-2UvXlL0dCmfCNyWI+zTFBfbSF1iUCdYpiZHtxJ60Qus="
},
"hye_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/hye/hye_sentences_detailed.tsv.bz2",
- "hash": "sha256-dryyNq3UyvmOjFJ5KYS/qT7sjlsEAvMJMVKPTjC92Xo="
+ "hash": "sha256-fy3nigZ0lFm8S7tTFG1C62sM24ARUK3rADqe4WwRaPs="
},
"rus_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus_sentences_detailed.tsv.bz2",
- "hash": "sha256-qBim3RMW6d+rJnMg4/ru+v2xl9c/4yFTdLLna0ZzRMA="
+ "hash": "sha256-mVuWwbIKQ5B6VA67t4g5nXvhJI2r3cOfuVxQ9LjEzuY="
},
"swe_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/swe/swe_sentences_detailed.tsv.bz2",
- "hash": "sha256-OMiKJXr5adxzFh2cQrHDm2wvmac9ilTunfmXuVNGNnU="
+ "hash": "sha256-91N14j+dxNEqtCxsiJYLa3ucddw5I6qhbY5TbrvEwG0="
},
"ukr_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/ukr/ukr_sentences_detailed.tsv.bz2",
- "hash": "sha256-Tqo2E7yYmhy70XYgIPq1cTsQWxeMmpGn7eopnRo+tqo="
+ "hash": "sha256-AOrNvcJHkcOPc1JMMhOgFjgYlh5WiZvD90LMo3IJmC4="
},
"deu-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/deu/deu-eng_links.tsv.bz2",
- "hash": "sha256-ElcWWK2thy0cMU+3fZMC/Aeuo+YbetcoyTg9ej57UoA="
+ "hash": "sha256-v1KowPUtiGoFuSLPh2iY9mwokR+Acj7zyIhhvdHAwDM="
},
"deu-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/deu/deu-rus_links.tsv.bz2",
- "hash": "sha256-uuUaKql1vs3b+PUlJvoBG3+QmAp10J+GUMoRAvBKVhQ="
+ "hash": "sha256-ukBZ7a2ty9lj7S1BXmX69e3l8vYaEhed60chjyNAXaI="
},
"eng-epo_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-epo_links.tsv.bz2",
- "hash": "sha256-v7xHRnm8xtiywU95KI1AKW9ShTV4+kJ7W0Fxvp098PE="
+ "hash": "sha256-wirahdCXD3tenBh1b7UuH59esCffSIaQqQp93o1HUys="
},
"eng-deu_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-deu_links.tsv.bz2",
- "hash": "sha256-ykMXhKbtfFp8+JkkwWvUrXI8Uyi/5+Ft5VSSok58Gfs="
+ "hash": "sha256-F5/Hhzsiy5HNqFd9EtoNU3kE615rRlzbUVlnmopmPQc="
},
"eng-fin_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-fin_links.tsv.bz2",
- "hash": "sha256-MyWgm517GHtS/13anvAodHmwcoXGSqm/1D65cuEUHZk="
+ "hash": "sha256-0++ISIp/NTCspYR70MRirFV+hf9Tk0T4OGKye/59PcM="
},
"eng-hye_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-hye_links.tsv.bz2",
@@ -57,27 +57,27 @@
},
"eng-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-rus_links.tsv.bz2",
- "hash": "sha256-O8gPqaSb0p5k8kJ5XDdUYJ3MeQ544dYvPLqXp3j9lCs="
+ "hash": "sha256-U2gXsSW0qRDYXqwPRflfRAkQow76OYNEioNqf1c9Vbs="
},
"eng-swe_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-swe_links.tsv.bz2",
- "hash": "sha256-KVzUcbHkrvwa7iSub8y3ASpT0Ik90gUYpbbje717PcI="
+ "hash": "sha256-Sl3tHyvnxa5odV35grHwRb/1xQcqxhX7y6Wn5f6TtkI="
},
"eng-ukr_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-ukr_links.tsv.bz2",
- "hash": "sha256-Du8d0ccJPfrR8GrLOIa9DaLlOJNxqgrR6wDjm6Bkcso="
+ "hash": "sha256-naH3pBr6UiyibngLcR+4aOC/Fuea9AVw/yBfPZcHY3Y="
},
"epo-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/epo/epo-eng_links.tsv.bz2",
- "hash": "sha256-FpVHgyIDlV4yteDr9+z8gFkBlwdn0JSC6GsbOAUIEsQ="
+ "hash": "sha256-khC54ySdn1r8yFQyFP0Gic0KZTsaVKZ8rOAkrrKgYgA="
},
"epo-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/epo/epo-rus_links.tsv.bz2",
- "hash": "sha256-HQs4Lno79hGQvKjDQBPCZ15flkTnGVy3QJh/6Fu45Mw="
+ "hash": "sha256-4/xBTtk/dFTKbvHFwLSpiH50DA4s/mfyu3uLiSq5WdM="
},
"fin-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/fin/fin-eng_links.tsv.bz2",
- "hash": "sha256-jtxczyEeBMkudWKBBEcm141FxPH2LELskU0V9iOz38c="
+ "hash": "sha256-oJtPsvcRkTo8LfvUj/NIoDbb9m84/5Z7bNtFg/cJbGU="
},
"fin-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/fin/fin-rus_links.tsv.bz2",
@@ -89,19 +89,19 @@
},
"hye-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/hye/hye-rus_links.tsv.bz2",
- "hash": "sha256-eP5bg1qsWfKgXCR8R2yvyVJc0TDcozLEF88Ie2Xt/qI="
+ "hash": "sha256-oSDdLfnS7719T2l1Bdx8BPFOMHA+lmArwMrf+3RXjNQ="
},
"rus-deu_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-deu_links.tsv.bz2",
- "hash": "sha256-LsxpJJc5jHOgdyJgms0CdokaC+vnou/Hi/i2UDTwUOM="
+ "hash": "sha256-7WxLWRenNdKNqcvWLu4Wy9Kp6dYjmy7GW5PU0Oq1pkU="
},
"rus-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-eng_links.tsv.bz2",
- "hash": "sha256-vQRKrhyJ7EtdedvP0QQjeSi62GA3Sk+trWT8C26+bkU="
+ "hash": "sha256-ozv1vP/0Lh2CJA8loquIt/S8Ff055MF4231047CoWs4="
},
"rus-epo_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-epo_links.tsv.bz2",
- "hash": "sha256-z8TbmjZQ4Xw8DlWdEHCd3yQlTfJvz/OMKLFiNoylJEc="
+ "hash": "sha256-GyUONN+6h4Pt2SETqErUdcs2vwoD2rto6oB/zwEy4uw="
},
"rus-fin_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-fin_links.tsv.bz2",
@@ -109,7 +109,7 @@
},
"rus-hye_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-hye_links.tsv.bz2",
- "hash": "sha256-oNC/ugk47b145Vwo5IlGpRZcMOhBxnVgrdtQA0kqqJs="
+ "hash": "sha256-HrEHEg/ELSEGmD37i9JvsWmaGuoPJkNiOh097GBe7MM="
},
"rus-swe_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-swe_links.tsv.bz2",
@@ -117,11 +117,11 @@
},
"rus-ukr_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-ukr_links.tsv.bz2",
- "hash": "sha256-rzOVfHwY4jlVXbkez3vLOuhsOnlc6C7sZf8S60+BM/c="
+ "hash": "sha256-/PVl2zEzhTX8KByvp5O5vSBIeP6DDozs7LYxVlpwsD8="
},
"swe-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/swe/swe-eng_links.tsv.bz2",
- "hash": "sha256-/ZUgTs7CfHdASfGAzXCEvBwGdhkQ/Momt18EeXiWJS4="
+ "hash": "sha256-ce8IvKxB0eeRtPCwH4ghPjKI5yDYBl75oqsiajlPMm4="
},
"swe-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/swe/swe-rus_links.tsv.bz2",
@@ -129,10 +129,10 @@
},
"ukr-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/ukr/ukr-eng_links.tsv.bz2",
- "hash": "sha256-rGuWeE5b/tAnnNyw53T08wKaIfpgttPScwjlLGNlmyI="
+ "hash": "sha256-5ppZ3nXZA+u1unqb2a8MA9AULmI81cln9u9M07pcnoY="
},
"ukr-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/ukr/ukr-rus_links.tsv.bz2",
- "hash": "sha256-eN9g1IbacwBW71yfy3zV7egBT5OxGwTKJpJHF9nZEr0="
+ "hash": "sha256-vFWZI5UTNfsYn8eCSRjX5sIE5dfBerFnC/k1QvqHX6g="
}
}
diff --git a/pkgs/embedded/embox/0001-fix-build.patch b/pkgs/embedded/embox/0001-fix-build.patch
@@ -1,8 +1,8 @@
diff --git i/mk/flags.mk w/mk/flags.mk
-index baf62448e..7d5c2a74b 100644
+index 522274885..35745d98c 100644
--- i/mk/flags.mk
+++ w/mk/flags.mk
-@@ -12,23 +12,23 @@ BUILD_DEPS_CPPFLAGS ?=
+@@ -13,14 +13,14 @@ BUILD_DEPS_CPPFLAGS_AFTER ?=
BUILD_DEPS_LDFLAGS ?=
CROSS_COMPILE ?=
@@ -24,15 +24,13 @@ index baf62448e..7d5c2a74b 100644
+SIZE = $(CROSS_COMPILE)size
ifeq ($(COMPILER),clang)
- CC ?= clang
- # for clang LIBGCC_FINDER will be set externally to arm-none-eabi-gcc or something like that
- else
--CC ?= $(CROSS_COMPILE)gcc
-+CC = $(CROSS_COMPILE)gcc
+ CC := clang
+@@ -29,7 +29,7 @@ else
+ CC := $(CROSS_COMPILE)gcc
LIBGCC_FINDER=$(CC) $(CFLAGS)
endif
-CPP ?= $(CC) -E
+CPP = $(CC) -E
- comma_sep_list = $(subst $(\s),$(,),$(strip $1))
+ CPPFLAGS += -D__EMBOX_VERSION__=\"$(EMBOX_VERSION)\"
diff --git a/pkgs/embedded/embox/default.nix b/pkgs/embedded/embox/default.nix
@@ -22,13 +22,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "embox-${arch}-qemu";
- version = "0.5.8";
+ version = "0.5.9";
src = fetchFromGitHub {
owner = "embox";
repo = "embox";
rev = "v${finalAttrs.version}";
- hash = "sha256-swXqeq7QxxoZaEZ4Le3Jppp82pio31fBqP+d6DTYqqg=";
+ hash = "sha256-t7HuFpux80ayqraQbENQzN0xNFWsehhyxE0kQ6eEup4=";
};
patches = [ ./0001-fix-build.patch ];
