public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #108510 from zowoq/fzf

Browse Source 
fzf: 0.24.4 -> 0.25.0
This commit is contained in:
Sandro 2021-01-07 00:14:22 +01:00 committed by GitHub
commit de2c770f3e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/tools/misc/fzf/default.nix
View File

@ -1,20 +1,28 @@
{ lib, buildGoModule, fetchFromGitHub, writeText, runtimeShell, ncurses, perl }: { lib, buildGoModule, fetchFromGitHub, writeText, runtimeShell, ncurses, perl, fetchpatch }:
buildGoModule rec { buildGoModule rec {
pname = "fzf"; pname = "fzf";
version = "0.24.4"; version = "0.25.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "junegunn"; owner = "junegunn";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "17k32wr70sp7ag69xww2q9mrgnzakgkjw6la04n3jlhfa5z37dzj"; sha256 = "1j5bfxl4w8w3n89p051y8dhxg0py9l98v7r2gkr63bg4lj32faz8";
}; };
vendorSha256 = "0dd0qm1fxp3jnlrhfaas8fw87cj7rygaac35a9nk3xh2xsk7q35p"; vendorSha256 = "0dd0qm1fxp3jnlrhfaas8fw87cj7rygaac35a9nk3xh2xsk7q35p";
outputs = [ "out" "man" ]; outputs = [ "out" "man" ];
patches = [
# Fix test failure on go 1.15
(fetchpatch {
url = "https://github.com/junegunn/fzf/commit/82791f7efccde5b30da0b4d44f10d214ae5c0c0d.patch";
sha256 = "1nybsz09h8cnvxjnkmx9c52g8z0x6pvrn230hw1va5a3pvmg01z1";
})
];
fishHook = writeText "load-fzf-keybindings.fish" "fzf_key_bindings"; fishHook = writeText "load-fzf-keybindings.fish" "fzf_key_bindings";
buildInputs = [ ncurses ]; buildInputs = [ ncurses ];
@ -24,7 +32,7 @@ buildGoModule rec {
]; ];
# The vim plugin expects a relative path to the binary; patch it to abspath. # The vim plugin expects a relative path to the binary; patch it to abspath.
patchPhase = '' postPatch = ''
sed -i -e "s|expand('<sfile>:h:h')|'$out'|" plugin/fzf.vim sed -i -e "s|expand('<sfile>:h:h')|'$out'|" plugin/fzf.vim
if ! grep -q $out plugin/fzf.vim; then if ! grep -q $out plugin/fzf.vim; then