git.iko.soy/typeable/nixpkgs
on master help sign in
fzf: 0.24.4 -> 0.25.0

https://github.com/junegunn/fzf/releases/tag/0.25.0

commit8710256ef45c8cbab1a4340d3f69108cfdd32526 authorzowoq <59103226+zowoq@users.noreply.github.com> dateWed 6 Jan 2021, 06:11 (6 years ago) parentf35bf8e
1 file changed+12−4
pkgs/tools/misc/fzf/default.nix+12−4
pkgs/tools/misc/fzf/default.nix+12−4
@@ -1,20 +1,28 @@
1−{ lib, buildGoModule, fetchFromGitHub, writeText, runtimeShell, ncurses, perl }:
1+{ lib, buildGoModule, fetchFromGitHub, writeText, runtimeShell, ncurses, perl, fetchpatch }:
22
33buildGoModule rec {
44 pname = "fzf";
5− version = "0.24.4";
5+ version = "0.25.0";
66
77 src = fetchFromGitHub {
88 owner = "junegunn";
99 repo = pname;
1010 rev = version;
11− sha256 = "17k32wr70sp7ag69xww2q9mrgnzakgkjw6la04n3jlhfa5z37dzj";
11+ sha256 = "1j5bfxl4w8w3n89p051y8dhxg0py9l98v7r2gkr63bg4lj32faz8";
1212 };
1313
1414 vendorSha256 = "0dd0qm1fxp3jnlrhfaas8fw87cj7rygaac35a9nk3xh2xsk7q35p";
1515
1616 outputs = [ "out" "man" ];
1717
18+ patches = [
19+ # Fix test failure on go 1.15
20+ (fetchpatch {
21+ url = "https://github.com/junegunn/fzf/commit/82791f7efccde5b30da0b4d44f10d214ae5c0c0d.patch";
22+ sha256 = "1nybsz09h8cnvxjnkmx9c52g8z0x6pvrn230hw1va5a3pvmg01z1";
23+ })
24+ ];
25+
1826 fishHook = writeText "load-fzf-keybindings.fish" "fzf_key_bindings";
1927
2028 buildInputs = [ ncurses ];
@@ -24,7 +32,7 @@ buildGoModule rec {
2432 ];
2533
2634 # The vim plugin expects a relative path to the binary; patch it to abspath.
27− patchPhase = ''
35+ postPatch = ''
2836 sed -i -e "s|expand('<sfile>:h:h')|'$out'|" plugin/fzf.vim
2937
3038 if ! grep -q $out plugin/fzf.vim; then