From 2148c8bfaa23488c19ed922f8c9cb616b5b77435 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 10 Mar 2024 23:23:04 +0100 Subject: [PATCH 1/2] wyoming-faster-whisper: 1.1.0 -> 2.0.0 https://github.com/rhasspy/wyoming-faster-whisper/releases/tag/v2.0.0 --- pkgs/tools/audio/wyoming/faster-whisper.nix | 25 +++++++-------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/pkgs/tools/audio/wyoming/faster-whisper.nix b/pkgs/tools/audio/wyoming/faster-whisper.nix index bbef9e081310..a40657bdf5f6 100644 --- a/pkgs/tools/audio/wyoming/faster-whisper.nix +++ b/pkgs/tools/audio/wyoming/faster-whisper.nix @@ -1,30 +1,21 @@ { lib -, python3 +, python3Packages , fetchFromGitHub -, fetchpatch }: -python3.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "wyoming-faster-whisper"; - version = "1.1.0"; + version = "2.0.0"; pyproject = true; src = fetchFromGitHub { owner = "rhasspy"; repo = "wyoming-faster-whisper"; rev = "refs/tags/v${version}"; - hash = "sha256-RD6J/Q7kvd+sgTpR6ERyV+D8gpm0fF38L3U/Jp7gOgk="; + hash = "sha256-CeFSxL2Mn9lgboKghbteCl6VMTqruJgrI0io+TdaV5k="; }; - patches = [ - (fetchpatch { - # fix setup.py - url = "https://github.com/rhasspy/wyoming-faster-whisper/commit/cdd1536997a091dcf9054da9ff424a2603067755.patch"; - hash = "sha256-LGYo21FhKGXcAN9DjXzwIRqkOzTz3suXiQdgGrJSDBw="; - }) - ]; - - nativeBuildInputs = with python3.pkgs; [ + nativeBuildInputs = with python3Packages; [ setuptools pythonRelaxDepsHook ]; @@ -33,9 +24,8 @@ python3.pkgs.buildPythonApplication rec { "wyoming" ]; - propagatedBuildInputs = with python3.pkgs; [ - ctranslate2 - tokenizers + propagatedBuildInputs = with python3Packages; [ + faster-whisper wyoming ]; @@ -47,6 +37,7 @@ python3.pkgs.buildPythonApplication rec { doCheck = false; meta = with lib; { + changelog = "https://github.com/rhasspy/wyoming-faster-whisper/releases/tag/v${version}"; description = "Wyoming Server for Faster Whisper"; homepage = "https://github.com/rhasspy/wyoming-faster-whisper"; license = licenses.mit; From 3bc33ba58d98fcedf4435d60f7d1c534dbb6a93e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 13 Mar 2024 00:29:54 +0100 Subject: [PATCH 2/2] nixos/wyoming-faster-whisper: update model option --- .../services/audio/wyoming/faster-whisper.nix | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/nixos/modules/services/audio/wyoming/faster-whisper.nix b/nixos/modules/services/audio/wyoming/faster-whisper.nix index dd7f62744cd0..0c36e8c9ab05 100644 --- a/nixos/modules/services/audio/wyoming/faster-whisper.nix +++ b/nixos/modules/services/audio/wyoming/faster-whisper.nix @@ -37,22 +37,13 @@ in enable = mkEnableOption (mdDoc "Wyoming faster-whisper server"); model = mkOption { - # Intersection between available and referenced models here: - # https://github.com/rhasspy/models/releases/tag/v1.0 - # https://github.com/rhasspy/rhasspy3/blob/wyoming-v1/programs/asr/faster-whisper/server/wyoming_faster_whisper/download.py#L17-L27 - type = enum [ - "tiny" - "tiny-int8" - "base" - "base-int8" - "small" - "small-int8" - "medium-int8" - ]; + type = str; default = "tiny-int8"; - example = "medium-int8"; + example = "Systran/faster-distil-whisper-small.en"; description = mdDoc '' Name of the voice model to use. + + Check the [2.0.0 release notes](https://github.com/rhasspy/wyoming-faster-whisper/releases/tag/v2.0.0) for possible values. ''; };