b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

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

Browse source 
fishPlugins.fzf-fish: 9.3 -> 9.7
This commit is contained in:
Nick Cao 2023-04-04 09:38:00 +08:00 committed by GitHub
parent c45adc4c55 f95d6c4cc2
commit 26337e9860
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
pkgs/shells/fish/plugins/fzf-fish.nix
View file

@ -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 ];
};
}