diff options
author | natsukium <tomoya.otabi@gmail.com> | 2023-04-03 14:37:31 +0900 |
---|---|---|
committer | natsukium <tomoya.otabi@gmail.com> | 2023-04-03 22:33:16 +0900 |
commit | e00db8e1fe3b0553e433133af4ba4bfd358cab16 (patch) | |
tree | 496a4a5598b050bc3717bca5cfbde04749e6c9dd /pkgs/shells/fish | |
parent | 28031f75796b1fb4ed9b7a26491666b26bb3e21a (diff) | |
download | nixpkgs-e00db8e1fe3b0553e433133af4ba4bfd358cab16.tar nixpkgs-e00db8e1fe3b0553e433133af4ba4bfd358cab16.tar.gz nixpkgs-e00db8e1fe3b0553e433133af4ba4bfd358cab16.tar.bz2 nixpkgs-e00db8e1fe3b0553e433133af4ba4bfd358cab16.tar.lz nixpkgs-e00db8e1fe3b0553e433133af4ba4bfd358cab16.tar.xz nixpkgs-e00db8e1fe3b0553e433133af4ba4bfd358cab16.tar.zst nixpkgs-e00db8e1fe3b0553e433133af4ba4bfd358cab16.zip |
fishPlugins.fzf-fish: 9.3 -> 9.7
Diffstat (limited to 'pkgs/shells/fish')
-rw-r--r-- | pkgs/shells/fish/plugins/fzf-fish.nix | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/pkgs/shells/fish/plugins/fzf-fish.nix b/pkgs/shells/fish/plugins/fzf-fish.nix index 2480b9ea93c..a97c8f4ff07 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"' '' |