palo/nixos-config
palo/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

navi: bump version

Browse source
This commit is contained in:
Ingolf Wagner 2020-03-15 15:21:50 +08:00
parent ed2bcc42e3
commit 89b0690167
No known key found for this signature in database
GPG key ID: 76BF5F1928B9618B
2 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
pkgs/navi/default.nix
View file

@ -1,17 +1,15 @@
{ rustPlatform, fetchFromGitHub, stdenv, fzf, makeWrapper, ... }: { rustPlatform, fetchFromGitHub, stdenv, fzf, makeWrapper }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "navi";
name = "navi-${version}"; version = "48c2b64f7f184dc351d04d2fe2bda1b2313b8d79";
version = "e99e1511e50a2706f0eea3286df94b6373acf8b0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "denisidoro"; owner = "denisidoro";
repo = "navi"; repo = "navi";
# rev = "v${version}"; # rev = "v${version}";
rev = "${version}"; rev = "${version}";
sha256 = "07pfyvbzy62i5ncxgwcdim1pl5nfis3b8a2vkvjdvz167kx99xhg"; sha256 = "1y7mfai7a0hwzq7kw997w0jwjpzqr2wcfr66jxf60k2jpbf4bk8h";
}; };
cargoSha256 = "18d3b9g2jxkgscx9186v5301y4y01wd00kcs14617fgjnv0lyz1g"; cargoSha256 = "18d3b9g2jxkgscx9186v5301y4y01wd00kcs14617fgjnv0lyz1g";
@ -19,19 +17,21 @@ rustPlatform.buildRustPackage rec {
postInstall = '' postInstall = ''
mkdir -p $out/share/navi/ mkdir -p $out/share/navi/
cp -r ./cheats $out/share/navi/ mv cheats $out/share/navi/
mv shell $out/share/navi/
wrapProgram "$out/bin/navi" \ wrapProgram "$out/bin/navi" \
--suffix "PATH" : "${fzf}/bin" \ --suffix "PATH" : "${fzf}/bin" \
--suffix "NAVI_PATH" : "$out/share/navi/cheats" --suffix "NAVI_PATH" : "$out/share/navi/cheats"
''; '';
buildInputs = [ fzf makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "An interactive cheatsheet tool for the command-line"; description = "An interactive cheatsheet tool for the command-line";
homepage = "https://github.com/denisidoro/navi"; homepage = "https://github.com/denisidoro/navi";
license = licenses.asl20; license = licenses.asl20;
platforms = platforms.linux; platforms = platforms.unix;
maintainers = with maintainers; [ mrVanDalo ]; maintainers = with maintainers; [ mrVanDalo ];
}; };
} }

7
system/all/packages.nix
View file

@ -85,10 +85,6 @@ in {
duc duc
#(pkgs.writers.writeBashBin "navi" ''
# set -eu -o pipefail
# navi --path "$HOME/.cheats:${pkgs.navi}/share/navi/cheats" "$@"
#'')
navi navi
memoryUsage memoryUsage
@ -109,6 +105,9 @@ in {
# configure navi # configure navi
environment.variables.NAVI_PATH = "$HOME/.cheats"; environment.variables.NAVI_PATH = "$HOME/.cheats";
programs.zsh.loginShellInit = "source ${pkgs.navi}/shell/navi.plugins.zsh";
programs.bash.loginShellInit = "source ${pkgs.navi}/shell/navi.plugins.bash";
programs.fish.loginShellInit = "source ${pkgs.navi}/shell/navi.plugins.fish";
} }