whisper-cpp: 1.7.2 -> 1.7.5 (#382394)

Author: pbsds

pkgs/by-name/wh/whisper-cpp/download-models.patch

@@ -1,8 +1,8 @@
 diff --git a/models/download-ggml-model.sh b/models/download-ggml-model.sh
-index 1f1075b..7476c8e 100755
+index ef9c90da..a7e2a17c 100755
 --- a/models/download-ggml-model.sh
 +++ b/models/download-ggml-model.sh
-@@ -12,18 +12,6 @@ pfx="resolve/main/ggml"
+@@ -12,15 +12,6 @@ pfx="resolve/main/ggml"
  BOLD="\033[1m"
  RESET='\033[0m'
 
@@ -15,39 +15,43 @@ index 1f1075b..7476c8e 100755
 -        echo "$_ret"
 -    fi
 -}
--
--models_path="${2:-$(get_script_path)}"
--
+ 
+ script_path="$(get_script_path)"
+ 
+@@ -30,7 +21,6 @@ case "$script_path" in
+     *) default_download_path="$script_path" ;;  # Otherwise, use script directory
+ esac
+ 
+-models_path="${2:-$default_download_path}"
+ 
  # Whisper models
  models="tiny
- tiny.en
-@@ -64,8 +52,8 @@ list_models() {
+@@ -80,8 +70,8 @@ list_models() {
      printf "\n\n"
  }
 
 -if [ "$#" -lt 1 ] || [ "$#" -gt 2 ]; then
 -    printf "Usage: %s <model> [models_path]\n" "$0"
-+if [ "$#" -ne 1 ]; then
++if [ "$#" -lt 1 ]; then
 +    printf "Usage: %s <model>\n" "$0"
      list_models
      printf "___________________________________________________________\n"
      printf "${BOLD}.en${RESET} = english-only ${BOLD}-q5_[01]${RESET} = quantized ${BOLD}-tdrz${RESET} = tinydiarize\n"
-@@ -94,8 +82,6 @@ echo "$model" | grep -q '^"tdrz"*$'
+@@ -110,7 +100,6 @@ echo "$model" | grep -q '^"tdrz"*$'
 
  printf "Downloading ggml model %s from '%s' ...\n" "$model" "$src"
 
 -cd "$models_path" || exit
--
+ 
  if [ -f "ggml-$model.bin" ]; then
      printf "Model %s already exists. Skipping download.\n" "$model"
-     exit 0
-@@ -116,7 +102,7 @@ if [ $? -ne 0 ]; then
-     exit 1
+@@ -143,7 +132,7 @@ else
+     whisper_cmd="./build/bin/whisper-cli"
  fi
 
 -printf "Done! Model '%s' saved in '%s/ggml-%s.bin'\n" "$model" "$models_path" "$model"
 +printf "Done! Model '%s' saved in 'ggml-%s.bin'\n" "$model" "$model"
  printf "You can now use it like this:\n\n"
--printf "  $ ./main -m %s/ggml-%s.bin -f samples/jfk.wav\n" "$models_path" "$model"
-+printf "  $ whisper-cpp -m ggml-%s.bin -f samples/jfk.wav\n" "$model"
+-printf "  $ %s -m %s/ggml-%s.bin -f samples/jfk.wav\n" "$whisper_cmd" "$models_path" "$model"
++printf "  $ %s -m /ggml-%s.bin -f samples/jfk.wav\n" "$whisper_cmd" "$model"
  printf "\n"

pkgs/by-name/wh/whisper-cpp/package.nix

@@ -2,6 +2,7 @@
   lib,
   stdenv,
   cmake,
+  git,
   apple-sdk_11,
   ninja,
   fetchFromGitHub,
@@ -43,8 +44,6 @@ let
     cmakeFeature
     optional
     optionals
-    optionalString
-    forEach
     ;
 
   darwinBuildInputs = [ apple-sdk_11 ];
@@ -73,13 +72,13 @@ let
 in
 effectiveStdenv.mkDerivation (finalAttrs: {
   pname = "whisper-cpp";
-  version = "1.7.2";
+  version = "1.7.5";
 
   src = fetchFromGitHub {
-    owner = "ggerganov";
+    owner = "ggml-org";
     repo = "whisper.cpp";
-    rev = "refs/tags/v${finalAttrs.version}";
-    hash = "sha256-y30ZccpF3SCdRGa+P3ddF1tT1KnvlI4Fexx81wZxfTk=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-tvCT0QRdmRGsjtQZcEZMgSe2/47tSkfdaPqS/2MuQTs=";
   };
 
   # The upstream download script tries to download the models to the
@@ -89,7 +88,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
   patches = [ ./download-models.patch ];
 
   postPatch = ''
-    for target in examples/{bench,command,main,quantize,server,stream,talk}/CMakeLists.txt; do
+    for target in examples/{bench,command,cli,quantize,server,stream,talk-llama}/CMakeLists.txt; do
       if ! grep -q -F 'install('; then
         echo 'install(TARGETS ''${TARGET} RUNTIME)' >> $target
       fi
@@ -99,6 +98,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs =
     [
       cmake
+      git
       ninja
       which
       makeWrapper
@@ -154,17 +154,11 @@ effectiveStdenv.mkDerivation (finalAttrs: {
 
   postInstall = ''
     # Add "whisper-cpp" prefix before every command
-    mv -v $out/bin/{main,whisper-cpp}
+    mv -v "$out/bin/"{quantize,whisper-quantize}
 
-    for file in $out/bin/*; do
-      if [[ -x "$file" && -f "$file" && "$(basename $file)" != "whisper-cpp" ]]; then
-        mv -v "$file" "$out/bin/whisper-cpp-$(basename $file)"
-      fi
-    done
-
-    install -v -D -m755 $src/models/download-ggml-model.sh $out/bin/whisper-cpp-download-ggml-model
+    install -v -D -m755 "$src/models/download-ggml-model.sh" "$out/bin/whisper-cpp-download-ggml-model"
 
-    wrapProgram $out/bin/whisper-cpp-download-ggml-model \
+    wrapProgram "$out/bin/whisper-cpp-download-ggml-model" \
       --prefix PATH : ${lib.makeBinPath [ wget ]}
   '';
 
@@ -174,7 +168,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
 
   installCheckPhase = ''
     runHook preInstallCheck
-    $out/bin/whisper-cpp --help >/dev/null
+    "$out/bin/whisper-cli" --help >/dev/null
     runHook postInstallCheck
   '';
 
@@ -186,7 +180,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
     '';
     homepage = "https://github.com/ggerganov/whisper.cpp";
     license = lib.licenses.mit;
-    mainProgram = "whisper-cpp";
+    mainProgram = "whisper-cli";
     platforms = lib.platforms.all;
     broken = coreMLSupport;
     badPlatforms = optionals cudaSupport lib.platforms.darwin;