commit 758f3255c1a795319b0cd60625c4eb1cc85f244a
parent 13e9372e9536f0fb82bf74553c44b0197fd78062
Author: Nikolay Korotkiy <sikmir@disroot.org>
Date: Fri, 21 Oct 2022 20:50:49 +0300
Up
Diffstat:
5 files changed, 42 insertions(+), 38 deletions(-)
diff --git a/flake.lock b/flake.lock
@@ -17,11 +17,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1664817920,
- "narHash": "sha256-lGYXsICzTMOvFOcS4N/hmHxOuqnOeuHUGrETefq9u3c=",
+ "lastModified": 1666333455,
+ "narHash": "sha256-oHXIeLB/sPWxKNcSdV1DQi1ddNVoJ17T1yDiMMeygL4=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "e166ced03f34f5c22a1a643aac860003d9c409b7",
+ "rev": "93e0ac196106dce51878469c9a763c6233af5c57",
"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-09-17";
+ version = "2022-10-15";
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,95 +1,95 @@
{
"deu_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/deu/deu_sentences_detailed.tsv.bz2",
- "hash": "sha256-g9PeKoofnfbSGCuSnmpzBN1PNyoWKFMQe4tvJZ6UItw="
+ "hash": "sha256-JHqmDPBjg6xZkBjQpfImUXantEcL9+BCZ9g7kg3ppto="
},
"eng_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng_sentences_detailed.tsv.bz2",
- "hash": "sha256-vPIFbu+C98txF4NoO5es+dMD8EwnMaWxiOhLEdr60e8="
+ "hash": "sha256-0tRjRBwDonzzAGVaJxFsaQV4HGZ4rHLMw+NmyLeCm1Q="
},
"epo_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/epo/epo_sentences_detailed.tsv.bz2",
- "hash": "sha256-JpaMa/us/AtPxB4E5cE+EkSSqQ8dSrgXJCu7K0fUfxE="
+ "hash": "sha256-kPfGM/720RdfWb6UqigZA91IY/kgjqWsSUPO7hmiLmU="
},
"fin_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/fin/fin_sentences_detailed.tsv.bz2",
- "hash": "sha256-q58fGr6DLLZkZ/JdfGl+qbGNvjhL/74H/e0oebYBE3U="
+ "hash": "sha256-Q91mkbMCrbUjb3Q7Cwnd5bWMRCRAw0PBmtm4KoO2P6A="
},
"rus_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus_sentences_detailed.tsv.bz2",
- "hash": "sha256-199CsG0b3O0rAynGNksdjzoijlEz4CIwaH/Ac3XmV4U="
+ "hash": "sha256-GEMqbHSWqfUWHA6caE3O5h6is/VPsNnaBqX25ZNwYfI="
},
"swe_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/swe/swe_sentences_detailed.tsv.bz2",
- "hash": "sha256-VzdU7vVdMZfUKGMBsZWGJWwdNmJ6Q/EAhJYbORBqbTo="
+ "hash": "sha256-oRbrfw9QsudFwqeZDK4i6mHZGfHb0Cyhf6KNO8NJDd8="
},
"ukr_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/ukr/ukr_sentences_detailed.tsv.bz2",
- "hash": "sha256-anlcuCTcUq0uhqbyn83ESvHBCtucEUh0tN5SFCk9E2c="
+ "hash": "sha256-tdhYONmqIxppv7LQCgLIZGs9hRiyMhZq4lXEc6zmZyw="
},
"deu-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/deu/deu-eng_links.tsv.bz2",
- "hash": "sha256-LiCTbHuciloM53/RPQQixd7ddpUF52iPHRIO9KRJWKE="
+ "hash": "sha256-quOg+PZ1IMZReKV1ROT5JJygosLfgvHL5FGCqtePR8I="
},
"deu-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/deu/deu-rus_links.tsv.bz2",
- "hash": "sha256-64+m0KaWvDm539/nE4B+5O7Q7Za22Mvop/3fsRRMd3g="
+ "hash": "sha256-ZVTjshaCF5Ujov6EGvZKqyk7k8glWnuWAXSTAeqYkuI="
},
"eng-epo_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-epo_links.tsv.bz2",
- "hash": "sha256-hlralHM8aX+ihfm91zft6XXaanDOpj1BYj/USVLYB6w="
+ "hash": "sha256-UOtUCUz0fmQse2XY8SVr7YQQKXOPP2rnGQz+YuX5b0w="
},
"eng-deu_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-deu_links.tsv.bz2",
- "hash": "sha256-f8JmRpGk+98clD0ouLSj4vFowgfTSeJ5a2DDNTqWV9k="
+ "hash": "sha256-ldHQhBeYn8VuQOo9ssVW27oCNc1hUP1162f5Ne8WDMA="
},
"eng-fin_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-fin_links.tsv.bz2",
- "hash": "sha256-VrO3s8WNYWmv9IqvOzeNuYHlLXb1xv7T6KCp1katfE8="
+ "hash": "sha256-U84PUajvNv4Oe9STdTVqntWn5yjY9SjWef4UiBlg8y8="
},
"eng-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-rus_links.tsv.bz2",
- "hash": "sha256-LyIGyiIx/jqGF8mh6BZllHrm0759HJ15WZ54B6Wce0M="
+ "hash": "sha256-hCDxBbLghiipMVYfSI2IQic9ce3VGBxIiFvZTmp7ZPU="
},
"eng-swe_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-swe_links.tsv.bz2",
- "hash": "sha256-2MRX4Uflt05cdrwP/h9kP4g8uXoF8xWxk9pa2dSA1hc="
+ "hash": "sha256-0m9xfZDROLP1QoK3MYc42WNjfIEl9x0GcB++VlZ5A1I="
},
"eng-ukr_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-ukr_links.tsv.bz2",
- "hash": "sha256-hV3utGwHTqkIaBn8XLVPjaXYMqTf5PYlDapHsGF/Crc="
+ "hash": "sha256-QPzXdGRDeIP1wwxi0a9L2GoYNjtOL1QVzQV6OTmVLyE="
},
"epo-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/epo/epo-eng_links.tsv.bz2",
- "hash": "sha256-3emqrSU9/2hXptaUzku8pR/nDhqqkse3Cub89lRAMWw="
+ "hash": "sha256-WK15iGjpazsSQRVBjdH67w1YQ3L43X8Nd53NhwWECeU="
},
"epo-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/epo/epo-rus_links.tsv.bz2",
- "hash": "sha256-vNi+YJ9iN66a7ofvyEDq9NJmkFlHUFNznisytNBWZY8="
+ "hash": "sha256-aA7H0xTbH6WEa02AkEkdcDTrNw06ErdTo5eBwcWmuLI="
},
"fin-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/fin/fin-eng_links.tsv.bz2",
- "hash": "sha256-1o+cV/Hqmt4ejqHgSy3+TtobKEB15ruoMSn9QFr2JaU="
+ "hash": "sha256-HoozswsAk4SbUytYW2HPFTpG2nJdwOVic0oFP/YJPFk="
},
"fin-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/fin/fin-rus_links.tsv.bz2",
- "hash": "sha256-M3+WQh7+duGMAhJAfPyKnUOHyYKBbaoUug5FNrwKA+Q="
+ "hash": "sha256-u9cvFVUHjl+/Rrw416ebnqP4Cp7L02La6wQB7VKdkiM="
},
"rus-deu_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-deu_links.tsv.bz2",
- "hash": "sha256-BXGYnlN/E/dx2oQr5xyCqb8yNiSBqdphmzUXR3m2Nvw="
+ "hash": "sha256-sNjvhRNrumOqqO5l7aelB+2KSmIRRZrD/2h8ZKWEESg="
},
"rus-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-eng_links.tsv.bz2",
- "hash": "sha256-stx3g5E/nakacVpmLHOSygRHn9puo4j38lDSKwT8Xvc="
+ "hash": "sha256-KDxhocaV9eyjxVO//+z94zJOeAKyEbhOv/xH2DLz86o="
},
"rus-epo_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-epo_links.tsv.bz2",
- "hash": "sha256-IxcLVD9PZgsOnYNSHMB/Yy7XYp8EB/Selggo3UGUIa8="
+ "hash": "sha256-DminqY7c/sA+5+WRmo6u+BZL41dXCRXpDirk0vruyVc="
},
"rus-fin_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-fin_links.tsv.bz2",
- "hash": "sha256-N5ria5tqbyPYoHSnFbTs7t513po7kFbaUrE7z3qFVhg="
+ "hash": "sha256-Wuai4+BwwYR9ab6QGD+QgHhjpPaDInqwx/PgdXI70PM="
},
"rus-swe_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-swe_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-usdVVb8jmUkN8OO8O6WWdYYHDLj0bUBlge9JNFNIkdg="
+ "hash": "sha256-KIOslmCxSUGNxo/RaPYkWDh7tP+JFzNqNtIqJEQvzUk="
},
"swe-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/swe/swe-eng_links.tsv.bz2",
- "hash": "sha256-w9xzNZJOLgJMkxYEvqa7sewiq5Xom/kbpcdGObPdwSI="
+ "hash": "sha256-h4AKZMMTQJEtmTipHo6sOpf78EeVhQa411iDywARjzw="
},
"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-E2TkQkMug5rz9J37LOOcwQhbIfxPzi6CWNrGDRaZ6tU="
+ "hash": "sha256-nyI4k2k2RiHaaKI8Lbnl9g1CmoNC666MlOrgZDLQQ5g="
},
"ukr-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/ukr/ukr-rus_links.tsv.bz2",
- "hash": "sha256-0uDsSTHQ3DDwh/CSGSQeirbCDOuSQG1meSMRXiUs/VU="
+ "hash": "sha256-7pfPMCSbcnLY2b+Nm9ZDKZ+rrFdojqJN0lIGNuLr3eI="
}
}
diff --git a/pkgs/gemini/gplaces/default.nix b/pkgs/gemini/gplaces/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "gplaces";
- version = "0.16.27";
+ version = "0.16.30";
src = fetchFromGitHub {
owner = "dimkr";
repo = "gplaces";
rev = "v${version}";
- hash = "sha256-mC45OsDb1+qE8cYhuNsSwLEvOXjui33ENC3eYviyLyk=";
+ hash = "sha256-W/tXwxJ4j7q3ka36TI7y/Psf9VHGXL/F2rNRGGkBKo0=";
fetchSubmodules = true;
};
@@ -16,6 +16,8 @@ stdenv.mkDerivation rec {
buildInputs = [ curl openssl ] ++ lib.optional stdenv.isDarwin memstreamHook;
+ makeFlags = [ "VERSION=${version}" ];
+
installFlags = [ "PREFIX=$(out)" ];
meta = with lib; {
@@ -24,5 +26,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl3Plus;
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
+ broken = stdenv.isDarwin;
};
}
diff --git a/pkgs/suckless/libgrapheme/default.nix b/pkgs/suckless/libgrapheme/default.nix
@@ -1,12 +1,13 @@
-{ lib, stdenv, fetchurl }:
+{ lib, stdenv, fetchgit }:
stdenv.mkDerivation rec {
pname = "libgrapheme";
- version = "1";
+ version = "2.0.1";
- src = fetchurl {
- url = "https://dl.suckless.org/libgrapheme/libgrapheme-${version}.tar.gz";
- hash = "sha256-hiLfUVDOlB1cRmXQ4JodQsLCX2KKJ/SMoeZpV2Fi0PY=";
+ src = fetchgit {
+ url = "git://git.suckless.org/libgrapheme";
+ rev = "30766915c37d88fc423a4d750227a769e7a307ae";
+ hash = "sha256-cBpXRce4494ZVPRFjUQa5UJ6wvEfik2eUzv2bdEbz5E=";
};
makeFlags = [ "AR:=$(AR)" "CC:=$(CC)" "RANLIB:=$(RANLIB)" ];
