diff options
author | zowoq <59103226+zowoq@users.noreply.github.com> | 2021-01-06 06:11:26 +1000 |
---|---|---|
committer | zowoq <59103226+zowoq@users.noreply.github.com> | 2021-01-06 06:11:26 +1000 |
commit | 8710256ef45c8cbab1a4340d3f69108cfdd32526 (patch) | |
tree | 846d79d20261f37cca39988db9fded397d805b20 /pkgs/tools/misc/fzf | |
parent | f35bf8ef29d2bd9e4f1a915202de355e126a9ffd (diff) |
fzf: 0.24.4 -> 0.25.0
https://github.com/junegunn/fzf/releases/tag/0.25.0
Diffstat (limited to 'pkgs/tools/misc/fzf')
-rw-r--r-- | pkgs/tools/misc/fzf/default.nix | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index b114ee2373c13..837277a5c8585 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -1,20 +1,28 @@ -{ lib, buildGoModule, fetchFromGitHub, writeText, runtimeShell, ncurses, perl }: +{ lib, buildGoModule, fetchFromGitHub, writeText, runtimeShell, ncurses, perl, fetchpatch }: buildGoModule rec { pname = "fzf"; - version = "0.24.4"; + version = "0.25.0"; src = fetchFromGitHub { owner = "junegunn"; repo = pname; rev = version; - sha256 = "17k32wr70sp7ag69xww2q9mrgnzakgkjw6la04n3jlhfa5z37dzj"; + sha256 = "1j5bfxl4w8w3n89p051y8dhxg0py9l98v7r2gkr63bg4lj32faz8"; }; vendorSha256 = "0dd0qm1fxp3jnlrhfaas8fw87cj7rygaac35a9nk3xh2xsk7q35p"; 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"; buildInputs = [ ncurses ]; @@ -24,7 +32,7 @@ buildGoModule rec { ]; # 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 if ! grep -q $out plugin/fzf.vim; then |