aboutsummaryrefslogtreecommitdiff
path: root/nixpkgs/pkgs/tools/misc/fzf/default.nix
diff options
context:
space:
mode:
Diffstat (limited to 'nixpkgs/pkgs/tools/misc/fzf/default.nix')
-rw-r--r--nixpkgs/pkgs/tools/misc/fzf/default.nix19
1 files changed, 12 insertions, 7 deletions
diff --git a/nixpkgs/pkgs/tools/misc/fzf/default.nix b/nixpkgs/pkgs/tools/misc/fzf/default.nix
index e875dd77b02..d9fe6ac819b 100644
--- a/nixpkgs/pkgs/tools/misc/fzf/default.nix
+++ b/nixpkgs/pkgs/tools/misc/fzf/default.nix
@@ -1,14 +1,14 @@
-{ lib, buildGoModule, fetchFromGitHub, writeText, runtimeShell, ncurses }:
+{ lib, buildGoModule, fetchFromGitHub, writeText, runtimeShell, ncurses, perl }:
buildGoModule rec {
pname = "fzf";
- version = "0.21.1";
+ version = "0.22.0";
src = fetchFromGitHub {
owner = "junegunn";
repo = pname;
rev = version;
- sha256 = "0piz1dzczcw1nsff775zicvpm6iy0iw0v0ba7rj7i0xqv9ni1prw";
+ sha256 = "0n0cy5q2r3dm1a3ivlzrv9c5d11awxlqim5b9x8zc85dlr73n35l";
};
vendorSha256 = "1c2iz28hjrw9rig9a6r27wd8clycdhi8fgs3da91c63w4qi140zm";
@@ -27,9 +27,14 @@ buildGoModule rec {
echo "Failed to replace vim base_dir path with $out"
exit 1
fi
- '';
- doCheck = true;
+ # Has a sneaky dependency on perl
+ # Include first args to make sure we're patching the right thing
+ substituteInPlace shell/key-bindings.zsh \
+ --replace " perl -ne " " ${perl}/bin/perl -ne "
+ substituteInPlace shell/key-bindings.bash \
+ --replace " perl -n " " ${perl}/bin/perl -n "
+ '';
preInstall = ''
mkdir -p $out/share/fish/{vendor_functions.d,vendor_conf.d}
@@ -60,7 +65,7 @@ buildGoModule rec {
homepage = "https://github.com/junegunn/fzf";
description = "A command-line fuzzy finder written in Go";
license = licenses.mit;
- maintainers = with maintainers; [ filalex77 ma27 ];
+ maintainers = with maintainers; [ filalex77 ma27 zowoq ];
platforms = platforms.unix;
};
-} \ No newline at end of file
+}