From 3a85fa641d2b7d68b86757ac8144d8e784589974 Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Fri, 19 Jul 2024 11:45:04 +0200 Subject: [PATCH 1/2] fzf: 0.54.0 -> 0.54.1 --- pkgs/by-name/fz/fzf/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fz/fzf/package.nix b/pkgs/by-name/fz/fzf/package.nix index d0ec019eb96d..c2ba84a70f05 100644 --- a/pkgs/by-name/fz/fzf/package.nix +++ b/pkgs/by-name/fz/fzf/package.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "fzf"; - version = "0.54.0"; + version = "0.54.1"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf"; rev = "v${version}"; - hash = "sha256-y2A3WsPD58zbJx/vLKiuXJ1rVdlhQ9Ylm8sh+RYJ9qA="; + hash = "sha256-nE4ibYAOH3fgZbpf/tPocXFH6GfialYk/gvLltO8x/w="; }; - vendorHash = "sha256-GC92YuGHQuoLHb7etxpI20ZyvKlJNbeDnHyUOkM4lrg="; + vendorHash = "sha256-uhjJPB/jfRPAu9g41vWFnSBIN9TIZW3s6BGz0fA2ygE="; CGO_ENABLED = 0; From 3c72a5ae8ecdab15562f8d1593983206ab5c7c79 Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Fri, 19 Jul 2024 11:47:28 +0200 Subject: [PATCH 2/2] fzf: cleanup --- pkgs/by-name/fz/fzf/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fz/fzf/package.nix b/pkgs/by-name/fz/fzf/package.nix index c2ba84a70f05..4508d30e0407 100644 --- a/pkgs/by-name/fz/fzf/package.nix +++ b/pkgs/by-name/fz/fzf/package.nix @@ -45,7 +45,7 @@ buildGoModule rec { # fzf-tmux depends on bc substituteInPlace bin/fzf-tmux \ - --replace "bc" "${bc}/bin/bc" + --replace-fail "bc" "${lib.getExe bc}" ''; postInstall = '' @@ -53,9 +53,9 @@ buildGoModule rec { installManPage man/man1/fzf.1 man/man1/fzf-tmux.1 - install -D plugin/* -t $out/share/vim-plugins/${pname}/plugin + install -D plugin/* -t $out/share/vim-plugins/fzf/plugin mkdir -p $out/share/nvim - ln -s $out/share/vim-plugins/${pname} $out/share/nvim/site + ln -s $out/share/vim-plugins/fzf $out/share/nvim/site # Install shell integrations install -D shell/* -t $out/share/fzf/