Merge pull request #224441 from natsukium/fzf-fish/update

fishPlugins.fzf-fish: 9.3 -> 9.7

1 files changed, 12 insertions, 8 deletions

diff --git a/pkgs/shells/fish/plugins/fzf-fish.nix b/pkgs/shells/fish/plugins/fzf-fish.nix
index 2480b9ea93cb..f2f7fcd65409 100644
--- a/pkgs/shells/fish/plugins/fzf-fish.nix
+++ b/pkgs/shells/fish/plugins/fzf-fish.nix
@@ -1,31 +1,35 @@
-{ lib, stdenv, buildFishPlugin, fetchFromGitHub, fd, fzf, util-linux, clownfish, fishtape_3 }:
-
+{ lib, stdenv, pkgs, buildFishPlugin, fetchFromGitHub, fd, util-linux, procps, clownfish, fishtape_3, }:
+let
+  # we want `pkgs.fzf`, not `fishPlugins.fzf`
+  inherit (pkgs) fzf;
+in
 buildFishPlugin rec {
   pname = "fzf.fish";
-  version = "9.2";
+  version = "9.7";
 
   src = fetchFromGitHub {
     owner = "PatrickF1";
     repo = "fzf.fish";
     rev = "v${version}";
-    sha256 = "sha256-XmRGe39O3xXmTvfawwT2mCwLIyXOlQm7f40mH5tzz+s=";
+    sha256 = "sha256-haNSqXJzLL3JGvD4JrASVmhLJz6i9lna6/EdojXdFOo=";
   };
 
-  nativeCheckInputs = [ fzf fd util-linux ];
+  nativeCheckInputs = [ fzf fd util-linux procps ];
   checkPlugins = [ clownfish fishtape_3 ];
   checkFunctionDirs = [ "./functions" ];
   checkPhase = ''
     # Disable git tests which inspect the project's git repo, which isn't
     # possible since we strip the impure .git from our build input
     rm -r tests/*git*
+    rm -r tests/preview_changed_file/modified_path_with_spaces.fish
+    rm -r tests/preview_changed_file/renamed_path_modifications.fish
 
     # Disable tests that are failing, probably because of our wrappers
     rm -r tests/configure_bindings
-    rm -r tests/search_shell_variables
+    rm -r tests/search_variables
 
     # 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"' ''
@@ -35,6 +39,6 @@ buildFishPlugin rec {
     description = "Augment your fish command line with fzf key bindings";
     homepage = "https://github.com/PatrickF1/fzf.fish";
     license = licenses.mit;
-    maintainers = with maintainers; [ pacien ];
+    maintainers = with maintainers; [ pacien natsukium ];
   };
 }