From 6be8ae0525fe0675df55729aee7984add32a9bc5 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Wed, 23 Apr 2025 23:28:29 +0900 Subject: [PATCH 1/2] fzf-git-sh: add updateScript --- pkgs/by-name/fz/fzf-git-sh/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/fz/fzf-git-sh/package.nix b/pkgs/by-name/fz/fzf-git-sh/package.nix index 1494216f03e4..cda761d9f11d 100644 --- a/pkgs/by-name/fz/fzf-git-sh/package.nix +++ b/pkgs/by-name/fz/fzf-git-sh/package.nix @@ -14,6 +14,7 @@ tmux, util-linux, xdg-utils, + unstableGitUpdater, }: stdenv.mkDerivation rec { @@ -55,6 +56,8 @@ stdenv.mkDerivation rec { install -D fzf-git.sh $out/share/${pname}/fzf-git.sh ''; + passthru.updateScript = unstableGitUpdater { }; + meta = with lib; { homepage = "https://github.com/junegunn/fzf-git.sh"; description = "Bash and zsh key bindings for Git objects, powered by fzf"; From 0b3341c15e6c54062eccbe5d079f3977a9aea71e Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Wed, 23 Apr 2025 23:29:40 +0900 Subject: [PATCH 2/2] fzf-git-sh: 0-unstable-2024-03-17 -> 0-unstable-2025-02-20 Diff: https://github.com/junegunn/fzf-git.sh/compare/e4cba1fcf8aed9a2348e47b0ba64299...6651e719da630cd8e6e00191af7f225f6d13a801 --- pkgs/by-name/fz/fzf-git-sh/package.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/fz/fzf-git-sh/package.nix b/pkgs/by-name/fz/fzf-git-sh/package.nix index cda761d9f11d..4206d0eb051f 100644 --- a/pkgs/by-name/fz/fzf-git-sh/package.nix +++ b/pkgs/by-name/fz/fzf-git-sh/package.nix @@ -11,7 +11,6 @@ git, gnugrep, gnused, - tmux, util-linux, xdg-utils, unstableGitUpdater, @@ -19,19 +18,20 @@ stdenv.mkDerivation rec { pname = "fzf-git-sh"; - version = "0-unstable-2024-03-17"; + version = "0-unstable-2025-02-20"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf-git.sh"; - rev = "e4cba1fcf8aed9a2348e47b0ba64299122b81709"; - hash = "sha256-glI+TldLGGiXyI5ZghaEgjc+2DJCMdmBnho/Z7IgJoE="; + rev = "6651e719da630cd8e6e00191af7f225f6d13a801"; + hash = "sha256-FgJ5eyGU5EXmecwdjbiV+/rnyRaSMi8BLYWayeYgCJw="; }; dontBuild = true; postPatch = '' sed -i \ + -e "s,\bfzf\b,${fzf}/bin/fzf," \ -e "s,\bawk\b,${gawk}/bin/awk," \ -e "s,\bbash\b,${bash}/bin/bash," \ -e "s,\bbat\b,${bat}/bin/bat," \ @@ -40,10 +40,8 @@ stdenv.mkDerivation rec { -e "s,\bhead\b,${coreutils}/bin/head," \ -e "s,\buniq\b,${coreutils}/bin/uniq," \ -e "s,\bcolumn\b,${util-linux}/bin/column," \ - -e "s,\bfzf-tmux\b,${fzf}/bin/fzf-tmux," \ -e "s,\bgrep\b,${gnugrep}/bin/grep," \ -e "s,\bsed\b,${gnused}/bin/sed," \ - -e "/fzf-tmux/!s,\btmux\b,${tmux}/bin/tmux," \ -e "s,\bxargs\b,${findutils}/bin/xargs," \ -e "s,\bxdg-open\b,${xdg-utils}/bin/xdg-open," \ -e "/display-message\|fzf-git-\$o-widget\|\burl=\|\$remote_url =~ /!s,\bgit\b,${git}/bin/git,g" \