diff --git a/pkgs/shells/fish/plugins/fzf-fish.nix b/pkgs/shells/fish/plugins/fzf-fish.nix index 51e7dcc096b8..3547af490e6a 100644 --- a/pkgs/shells/fish/plugins/fzf-fish.nix +++ b/pkgs/shells/fish/plugins/fzf-fish.nix @@ -1,17 +1,17 @@ -{ lib, buildFishPlugin, fetchFromGitHub, fzf, clownfish, fishtape_3 }: +{ lib, stdenv, buildFishPlugin, fetchFromGitHub, fd, fzf, util-linux, clownfish, fishtape_3 }: buildFishPlugin rec { pname = "fzf.fish"; - version = "5.6"; + version = "7.3"; src = fetchFromGitHub { owner = "PatrickF1"; repo = "fzf.fish"; rev = "v${version}"; - sha256 = "1b280n8bh00n4vkm19zrn84km52296ljlm1zhz95jgaiwymf2x73"; + sha256 = "16mdfyznxjhv7x561srl559misn37a35d2q9fspxa7qg1d0sc3x9"; }; - checkInputs = [ fzf ]; + checkInputs = [ fzf fd util-linux ]; checkPlugins = [ clownfish fishtape_3 ]; checkFunctionDirs = [ "./functions" ]; checkPhase = '' @@ -20,10 +20,16 @@ buildFishPlugin rec { rm -r tests/*git* # Disable tests that are failing, probably because of our wrappers + rm -r tests/configure_bindings rm -r tests/search_shell_variables - fishtape tests/*/*.fish - ''; + # Disable tests that are failing, because there is not 'rev' command + rm tests/preview_file/custom_file_preview.fish + + '' + ( + if stdenv.isDarwin then ''script /dev/null fish -c "fishtape tests/*/*.fish"'' + else ''script -c 'fish -c "fishtape tests/*/*.fish"' '' + ); meta = with lib; { description = "Augment your fish command line with fzf key bindings";