nur-packages

My NUR packages
git clone git://git.sikmir.ru/nur-packages
Log | Files | Refs | README | LICENSE

commit cb0dd3f21f0ca6d0e68a61bdde98fb11d1fe3758
parent a3502ed71ff56cebd76c3af06f0ae9ff6e3816c2
Author: Nikolay Korotkiy <sikmir@disroot.org>
Date:   Tue, 17 May 2022 02:25:18 +0300

Up

Diffstat:
Mflake.lock | 12++++++------
Mpkgs/data/dicts/tatoeba/default.nix | 2+-
Mpkgs/data/dicts/tatoeba/tatoeba.json | 58+++++++++++++++++++++++++++++-----------------------------
Mpkgs/gemini/gmi2html/default.nix | 5-----
Mpkgs/gemini/stargazer/default.nix | 23++++++++++-------------
Mpkgs/osm/map-machine/default.nix | 6+++---
6 files changed, 49 insertions(+), 57 deletions(-)

diff --git a/flake.lock b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "flake-utils": { "locked": { - "lastModified": 1649676176, - "narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=", + "lastModified": 1652733177, + "narHash": "sha256-mRpdBbVk8tbYVgEE6oTBbFT1vkVdF7EzaP7bMQ26wWA=", "owner": "numtide", "repo": "flake-utils", - "rev": "a4b154ebbdc88c8498a5c7b01589addc9e9cb678", + "rev": "04b4d989fda8f14e6fcd1fee631eab9c54d15b97", "type": "github" }, "original": { @@ -17,11 +17,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1651545648, - "narHash": "sha256-7f1JYFHtfTOvois5LdXrKXthjb6rE9i8ZxWDQyzYKAk=", + "lastModified": 1652692103, + "narHash": "sha256-ygRLh8g0F/WkVCSfQcxMoVaaD45i6Ky+f+b4wCOazag=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "24c33ab7952544ad355d0677c9eea931b23f371c", + "rev": "556ce9a40abde33738e6c9eac65f965a8be3b623", "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-05-07"; + version = "2022-05-14"; 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,118 +1,118 @@ { "deu_sentences_detailed": { "url": "https://downloads.tatoeba.org/exports/per_language/deu/deu_sentences_detailed.tsv.bz2", - "hash": "sha256-XGomUSg5ke6mPih9Lh3VrJ823rMyXD4dnc6LpU+2Dbk=" + "hash": "sha256-lOrIaRwsC+Aeols/uPagUH6cRChflXIjyWHQVbDcgNA=" }, "eng_sentences_detailed": { "url": "https://downloads.tatoeba.org/exports/per_language/eng/eng_sentences_detailed.tsv.bz2", - "hash": "sha256-FFkBSVV3C9ercN+v7BTagx9wAbMGR3t/Tjq45eADA5A=" + "hash": "sha256-RaYDTIV7C9nqq9UYZRThVMFyjtY7nIroYpuichk4TLE=" }, "epo_sentences_detailed": { "url": "https://downloads.tatoeba.org/exports/per_language/epo/epo_sentences_detailed.tsv.bz2", - "hash": "sha256-k4Q2n2K2sxe3clOaRYtR2pk0Ialsi4rKUy1Npz0yFc0=" + "hash": "sha256-YAKedMRQx66wZkW4cqCKiLFvr9wFaXPxKMpKI5gIsc0=" }, "fin_sentences_detailed": { "url": "https://downloads.tatoeba.org/exports/per_language/fin/fin_sentences_detailed.tsv.bz2", - "hash": "sha256-qaxNyNCt/qHdXAVMB+55VVMgE7SL9nOYdrv27qHSixc=" + "hash": "sha256-AmuB2+Nepz8hXm1IBxUjTKq3I6fdResLXsQ4O6PEzpw=" }, "rus_sentences_detailed": { "url": "https://downloads.tatoeba.org/exports/per_language/rus/rus_sentences_detailed.tsv.bz2", - "hash": "sha256-8Hbpk11Y4X0jdObRRm7Nzh1E9nkLLbnX75s29w3/iyw=" + "hash": "sha256-gBfiP8uCoCkDSoocq4OnP/U/6MVKk1Kr2UEbRnt1j5E=" }, "swe_sentences_detailed": { "url": "https://downloads.tatoeba.org/exports/per_language/swe/swe_sentences_detailed.tsv.bz2", - "hash": "sha256-RqXuA2xvHfRJji4R1KFtZx70uVH/K3iTyUvVp3lsM58=" + "hash": "sha256-wPrzuBA38SOef/LS5NXV7lDoHW+FxxejixOBJmNxk3Q=" }, "ukr_sentences_detailed": { "url": "https://downloads.tatoeba.org/exports/per_language/ukr/ukr_sentences_detailed.tsv.bz2", - "hash": "sha256-O6q8rqbq8n3PDexQ1c0uBQDbJcIKKiazwfHyDjP9THY=" + "hash": "sha256-zX0yqONYxiVoQVLA+8pbn8t0qgnbcraElC40rm4H95U=" }, "deu-eng_links": { "url": "https://downloads.tatoeba.org/exports/per_language/deu/deu-eng_links.tsv.bz2", - "hash": "sha256-rVH9uy8UGhEuxYBzDKfMEXtQFLAmQFO3aP1llgQ6SMs=" + "hash": "sha256-RyzQUYkcGNnxVcd/NYQOcJEj0yv3qNT3FChAv+pBbok=" }, "deu-rus_links": { "url": "https://downloads.tatoeba.org/exports/per_language/deu/deu-rus_links.tsv.bz2", - "hash": "sha256-ZdMevw2FeKVB+lLtJ2LTZBt53KPsgHYsQFCH09jDiOk=" + "hash": "sha256-bT7ogAHu0FtIr7rwNECWfOuWHqOlmDGl9pORRH9vN3k=" }, "eng-epo_links": { "url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-epo_links.tsv.bz2", - "hash": "sha256-sCIthFgL4/YC3aYs7M4MzvKkb9hPbIScwKZuJbcK9Ww=" + "hash": "sha256-v75lpYcg5HNXSb/e3O1ECRY1kI4TcOq7r1DRH9BHydo=" }, "eng-deu_links": { "url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-deu_links.tsv.bz2", - "hash": "sha256-MoLCjxjypYD16F9ZKpXeMlbLrPWklLvb7lVPv47LYH4=" + "hash": "sha256-W0xkVnQudHQueyhga2iAMCNYMsLUhZDOtsUcp9QEh7Q=" }, "eng-fin_links": { "url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-fin_links.tsv.bz2", - "hash": "sha256-KbUiBZ/uxCUoM/VwAKl2zBRmRJjduIO6AaFqreGRrP8=" + "hash": "sha256-W/ordAnRDLbzpYurmdWMjBD3EC9vp6dmgH9oBsmlb8Y=" }, "eng-rus_links": { "url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-rus_links.tsv.bz2", - "hash": "sha256-5t0H2aVHffyU3mNYP/tdJvDCC5VEA3R8+RiDfbEeFLg=" + "hash": "sha256-GB3mAB59fVAaeSgqkZBIRpvXVKtocE6lRnIF8k35WIE=" }, "eng-swe_links": { "url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-swe_links.tsv.bz2", - "hash": "sha256-8eV1yDkM29+WT1ZclUfa1pSCWXDC5BcT9JJ1QLUS/Bk=" + "hash": "sha256-Mm3JdXH+i+Crnl4MHAlKsZbgzI0oYKurBfbuKSWgjMg=" }, "eng-ukr_links": { "url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-ukr_links.tsv.bz2", - "hash": "sha256-HXwqsNZ2+aokvZjH6dxoZTNWCAxM03/WAsPE7TwTPCc=" + "hash": "sha256-hrx9upDuQ05WXIpoo72vLs/Iek/VUEdanYaDjIGxEeU=" }, "epo-eng_links": { "url": "https://downloads.tatoeba.org/exports/per_language/epo/epo-eng_links.tsv.bz2", - "hash": "sha256-+ngQOKEnKY0ldtB3UyuTrUpG0FzI6jmCTw78Ule0XIM=" + "hash": "sha256-1lIpilh+wgN4QQT+0b9qDqMqKvzeXYgnG65rix103N4=" }, "epo-rus_links": { "url": "https://downloads.tatoeba.org/exports/per_language/epo/epo-rus_links.tsv.bz2", - "hash": "sha256-F2zL2keXcNtj5+/TB0x0yPSStv8HuzgddjsWRyaIqDg=" + "hash": "sha256-GeZaPifSF3aqDbduEDQCsGYsLJTwzZhUf8pprxhQicQ=" }, "fin-eng_links": { "url": "https://downloads.tatoeba.org/exports/per_language/fin/fin-eng_links.tsv.bz2", - "hash": "sha256-ZC0uEA5feiI/xt2XTqDCm2QYcc888dVHClABow8GSJ0=" + "hash": "sha256-27miFOyiymxUy/rd44nz/McZ9pHw5u2l3jBAxlseros=" }, "fin-rus_links": { "url": "https://downloads.tatoeba.org/exports/per_language/fin/fin-rus_links.tsv.bz2", - "hash": "sha256-R7IsKmqHM6CXC/7FWZRqUTFOdauAXhXbqIPL0crTOq8=" + "hash": "sha256-GS/IhS1bg28uw9qvyo9k8U63iJDWa0zhRYg79tcUuQQ=" }, "rus-deu_links": { "url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-deu_links.tsv.bz2", - "hash": "sha256-whzFt/lZuyBiftNesn1EXGKsCOQTWy3qYokCaF9ti/s=" + "hash": "sha256-GvNdWZK6ygqVTizoCS2D8zeJyFY0oH7qbwUgdFntncQ=" }, "rus-eng_links": { "url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-eng_links.tsv.bz2", - "hash": "sha256-qzQMWMm3Mw4psoNsjVxoX7yEn7LzXskJt+Q5GDq67Pw=" + "hash": "sha256-qIoU4YDS8NzVmUGdDNlUGDFnCNIieLKfotjn5vlwP6s=" }, "rus-epo_links": { "url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-epo_links.tsv.bz2", - "hash": "sha256-1VwHt+I6gHeSjAMzSKZ2gChgfD+Ar2hkJB6WEk0mBRU=" + "hash": "sha256-5TnR7uwTqhkhNg84IMT61xnjZ/YuFw4ocKqcMzWn/3M=" }, "rus-fin_links": { "url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-fin_links.tsv.bz2", - "hash": "sha256-LSFSNER09Q4MwlM1pD9kMZjpyDP5JgsHc4csa7Xvrj0=" + "hash": "sha256-2Cf2wg7kvK13uQOG4EXqN8mIwEgR9XfKnDUDI8KqrP4=" }, "rus-swe_links": { "url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-swe_links.tsv.bz2", - "hash": "sha256-7dZcn+MZoTR4Hxak6Tcxme0LPJQ2z2cuD6hHMC6vZnY=" + "hash": "sha256-Ol5dS5QLxEvbEvskpKDQbpdgyjFDL92zrHRzvfVv5iQ=" }, "rus-ukr_links": { "url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-ukr_links.tsv.bz2", - "hash": "sha256-FuYwGOzwz/YerAA4STrOpqu2fxWu8myyHQgJWVR//XI=" + "hash": "sha256-vxYCAa651KFvM/hxpLoXRkFkla3SxH6NzaiAV2chUnk=" }, "swe-eng_links": { "url": "https://downloads.tatoeba.org/exports/per_language/swe/swe-eng_links.tsv.bz2", - "hash": "sha256-efXQOj9b+C6Sknr7ZrllfwCUQKprMpVnoRKr+1eouS0=" + "hash": "sha256-LAWY6eJXQHZsXgY5nQlggcuaX7BIUN4pPQQeHeX/xbQ=" }, "swe-rus_links": { "url": "https://downloads.tatoeba.org/exports/per_language/swe/swe-rus_links.tsv.bz2", - "hash": "sha256-n+d6TKPSufIgLU5RwJBv7ssJ+tfUoBSg8LFkngR1yFg=" + "hash": "sha256-dmbI061avoGdKjiNwIlBjGCNn8fjBE9xWQV24sIZVDo=" }, "ukr-eng_links": { "url": "https://downloads.tatoeba.org/exports/per_language/ukr/ukr-eng_links.tsv.bz2", - "hash": "sha256-cDfN7kFLNXpIQywL+rFdb4bFOZJk/jqYRafkbDuyYOc=" + "hash": "sha256-PnN+dE/UuZSS0fIdoa7XRMJUtI5JzV3OjDIzWeXVPdM=" }, "ukr-rus_links": { "url": "https://downloads.tatoeba.org/exports/per_language/ukr/ukr-rus_links.tsv.bz2", - "hash": "sha256-wg2xiWuUoE3LoLRRAai/VYvUTYrDr2/DCMENpt43xEQ=" + "hash": "sha256-5qDH84rj3WgqcE6qzcdK06ht+/rBcXGWOoLjIEio4wc=" } } diff --git a/pkgs/gemini/gmi2html/default.nix b/pkgs/gemini/gmi2html/default.nix @@ -11,11 +11,6 @@ stdenv.mkDerivation rec { hash = "sha256-5m3erToDFkYOV1xoM+BLWbUOgP0A7TXthzQ0Sk1Qj+U="; }; - postPatch = '' - substituteInPlace tests/test.sh \ - --replace "zig-cache" "zig-out" - ''; - nativeBuildInputs = [ zig scdoc installShellFiles ]; buildPhase = '' diff --git a/pkgs/gemini/stargazer/default.nix b/pkgs/gemini/stargazer/default.nix @@ -1,19 +1,19 @@ -{ lib, stdenv, rustPlatform, fetchFromSourcehut, Security, scdoc, installShellFiles }: +{ lib, stdenv, rustPlatform, fetchFromSourcehut, Security, scdoc }: rustPlatform.buildRustPackage rec { pname = "stargazer"; - version = "0.6.1"; + version = "1.0.2"; src = fetchFromSourcehut { owner = "~zethra"; repo = pname; rev = version; - hash = "sha256-8wYTqZoLiMsPWY3+tYBCbRPqs0K5+3syMSJr+iTcTrE="; + hash = "sha256-uTGLqgf0BLeZXf6msn7teZEmhgvtvzcjmcHDU1mlSjo="; }; - cargoHash = "sha256-G0Wu/lseT5IFWkzc8PaU51ATMqw9nHJOwT3sXNYRMw4="; + cargoHash = "sha256-6VPvrGfcBRFGmUMMLPQXbCKqQmGjGbyG4Ogh0ZuEti0="; - nativeBuildInputs = [ scdoc installShellFiles ]; + nativeBuildInputs = [ scdoc ]; buildInputs = lib.optional stdenv.isDarwin Security; @@ -23,14 +23,11 @@ rustPlatform.buildRustPackage rec { ''; postInstall = '' - installManPage stargazer.1 - installManPage stargazer.ini.5 - - install -Dm644 config.ini -t $out/share/stargazer - - installShellCompletion --bash target/**/completions/stargazer.bash - installShellCompletion --fish target/**/completions/stargazer.fish - installShellCompletion --zsh target/**/completions/_stargazer + sh scripts/install \ + --prefix=$out \ + --bashdir=$out/share/bash-completion/completions \ + --zshdir=$out/share/zsh/site-functions \ + --fishdir=$out/share/fish/vendor_completions.d ''; meta = with lib; { diff --git a/pkgs/osm/map-machine/default.nix b/pkgs/osm/map-machine/default.nix @@ -2,14 +2,14 @@ python3Packages.buildPythonApplication rec { pname = "map-machine"; - version = "2022-05-02"; + version = "2022-05-16"; disabled = python3Packages.pythonOlder "3.9"; src = fetchFromGitHub { owner = "enzet"; repo = pname; - rev = "5f5d8818a3bd43dd1809b4bab84d92efcd8d2b78"; - hash = "sha256-t7aqEkQuFSnQejPgr3NDorP1BZaZyPMb/iEHFisHHyA="; + rev = "2b6f2d8968e02d88e1c65b5d87aec787d9756608"; + hash = "sha256-PfFayKH3GdOhxgfoX6jJHgDl95IdRQ9o76p1bs1O2MQ="; }; propagatedBuildInputs = with python3Packages; [