jj-fzf: 0.33.0 -> 0.34.0

pkgs/by-name/jj/jj-fzf/nix-preflight.patch

@@ -0,0 +1,24 @@
+diff --git a/preflight.sh b/preflight.sh
+index f1ed02fe60..43b9c365c5 100755
+--- a/preflight.sh
++++ b/preflight.sh
+@@ -78,19 +78,6 @@
+   test $(awk 'BEGIN{print(123)}') == 123 ||
+     __preflightish_die "Failed to find usable 'awk' executable in \$PATH"
+
+-# == Jujutsu ==
+-__preflightish_require "0.34" jj --version --ignore-working-copy
+-
+-# == fzf ==
+-__preflightish_require "0.65.2" fzf --version
+-
+-# == python3 ==
+-__preflightish_require "3.9" python3 --version
+-
+-# == column ==
+-command -v "column" > /dev/null 2>&1 ||
+-  __preflightish_die "Failed to find the 'column' executable in \$PATH"
+-
+ # == Success ==
+ [[ "${BASH_SOURCE[0]}" == "$0" ]] &&
+   echo "  OK         All preflight.sh checks passed"

pkgs/by-name/jj/jj-fzf/package.nix

@@ -8,42 +8,55 @@
   gnused,
   jujutsu,
   makeWrapper,
+  pandoc,
+  python3,
+  unixtools,
   stdenv,
 }:
 
 stdenv.mkDerivation rec {
   pname = "jj-fzf";
-  version = "0.33.0";
+  version = "0.34.0";
 
   src = fetchFromGitHub {
     owner = "tim-janik";
     repo = "jj-fzf";
     tag = "v${version}";
-    hash = "sha256-iVgX2Lu06t1pCQl5ZGgl3+lTv4HAPKbD/83STDtYhdU=";
+    hash = "sha256-aJyKVMg/yI2CmAx5TxN0w670Rq26ESdLzESgh8Jr4nE=";
   };
 
-  nativeBuildInputs = [ makeWrapper ];
+  strictDeps = true;
+  buildInputs = [ bashInteractive ];
+  nativeBuildInputs = [
+    bashInteractive
+    makeWrapper
+    pandoc
+    jujutsu
+  ];
 
   dontConfigure = true;
   dontBuild = true;
-
-  installPhase = ''
-    runHook preInstall
-    install -D jj-fzf $out/bin/jj-fzf
-    substituteInPlace $out/bin/jj-fzf \
-      --replace-fail "/usr/bin/env bash" "${lib.getExe bashInteractive}"
+  makeFlags = [ "PREFIX=${placeholder "out"}" ];
+  patches = [ ./nix-preflight.patch ];
+  postPatch = ''
+    substituteInPlace lib/gen-message.py \
+      --replace-fail '/usr/bin/env -S python3 -B' '${python3}/bin/python -B'
+    patchShebangs --build lib/*.sh
+    patchShebangs --host jj-fzf *.sh contrib/*.sh
+  '';
+  postInstall = ''
     wrapProgram $out/bin/jj-fzf \
       --prefix PATH : ${
         lib.makeBinPath [
-          bashInteractive
           coreutils
           fzf
           gawk
           gnused
           jujutsu
+          python3
+          unixtools.column
         ]
       }
-    runHook postInstall
   '';
 
   meta = with lib; {