Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs

Conflicts:
	nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix

1 files changed, 14 insertions, 5 deletions

diff --git a/nixpkgs/pkgs/tools/audio/openai-whisper-cpp/download-models.patch b/nixpkgs/pkgs/tools/audio/openai-whisper-cpp/download-models.patch
index c470231b59e8..7183c38b5166 100644
--- a/nixpkgs/pkgs/tools/audio/openai-whisper-cpp/download-models.patch
+++ b/nixpkgs/pkgs/tools/audio/openai-whisper-cpp/download-models.patch
@@ -1,5 +1,3 @@
-diff --git a/models/download-ggml-model.sh b/models/download-ggml-model.sh
-index 749b409..831f4c0 100755
 --- a/models/download-ggml-model.sh
 +++ b/models/download-ggml-model.sh
 @@ -9,18 +9,6 @@
@@ -16,11 +14,22 @@ index 749b409..831f4c0 100755
 -    fi
 -}
 -
--models_path="$(get_script_path)"
+-models_path="${2:-$(get_script_path)}"
 -
  # Whisper models
  models=(
      "tiny.en"
+@@ -56,8 +44,8 @@ function list_models {
+     printf "\n\n"
+ }
+ 
+-if [ "$#" -lt 1 ] || [ "$#" -gt 2 ]; then
+-    printf "Usage: $0 <model> [models_path]\n"
++if [ "$#" -ne 1 ]; then
++    printf "Usage: $0 <model>\n"
+     list_models
+ 
+     exit 1
 @@ -82,8 +70,6 @@ fi
  
  printf "Downloading ggml model $model from '$src' ...\n"
@@ -34,9 +43,9 @@ index 749b409..831f4c0 100755
      exit 1
  fi
  
--printf "Done! Model '$model' saved in 'models/ggml-$model.bin'\n"
+-printf "Done! Model '$model' saved in '$models_path/ggml-$model.bin'\n"
 +printf "Done! Model '$model' saved in 'ggml-$model.bin'\n"
  printf "You can now use it like this:\n\n"
--printf "  $ ./main -m models/ggml-$model.bin -f samples/jfk.wav\n"
+-printf "  $ ./main -m $models_path/ggml-$model.bin -f samples/jfk.wav\n"
 +printf "  $ whisper-cpp -m ggml-$model.bin -f samples/jfk.wav\n"
  printf "\n"