Merge pull request #209307 from deejayem/zsh-forgit-23.01.0

1 files changed, 15 insertions, 7 deletions

diff --git a/pkgs/shells/zsh/zsh-forgit/default.nix b/pkgs/shells/zsh/zsh-forgit/default.nix
index ce99b5e34484..ff1a5f7d9c75 100644
--- a/pkgs/shells/zsh/zsh-forgit/default.nix
+++ b/pkgs/shells/zsh/zsh-forgit/default.nix
@@ -1,14 +1,25 @@
-{ stdenv, lib, bash, fetchFromGitHub, makeWrapper, fzf, git }:
+{ stdenv
+, lib
+, bash
+, coreutils
+, findutils
+, fetchFromGitHub
+, fzf
+, git
+, gnugrep
+, gnused
+, makeWrapper
+}:
 
 stdenv.mkDerivation rec {
   pname = "zsh-forgit";
-  version = "22.12.0";
+  version = "23.01.0";
 
   src = fetchFromGitHub {
     owner = "wfxr";
     repo = "forgit";
     rev = version;
-    sha256 = "0juBNUJW4SU3Cl6ouD+xMYzlCJOL7NAYpueZ6V56/ck=";
+    sha256 = "sha256-guAjxFhtybbRyRRXDELDHrM2Xzmi96wPxD2nhL9Ifmk=";
   };
 
   strictDeps = true;
@@ -16,9 +27,6 @@ stdenv.mkDerivation rec {
   postPatch = ''
     substituteInPlace forgit.plugin.zsh \
       --replace "\$INSTALL_DIR/bin/git-forgit" "$out/bin/git-forgit"
-
-    substituteInPlace bin/git-forgit \
-      --replace "/bin/bash" "${bash}/bin/bash"
   '';
 
   dontBuild = true;
@@ -31,7 +39,7 @@ stdenv.mkDerivation rec {
     install -D bin/git-forgit $out/bin/git-forgit
     install -D forgit.plugin.zsh $out/share/zsh/${pname}/forgit.plugin.zsh
     wrapProgram $out/bin/git-forgit \
-      --prefix PATH : ${lib.makeBinPath [ fzf git ]}
+      --prefix PATH : ${lib.makeBinPath [ bash coreutils findutils fzf git gnugrep gnused ]}
 
     runHook postInstall
   '';