From 94ecc3da74ce1595460f3657b0e00c708465a94c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 23 Oct 2023 01:05:11 +0200 Subject: [PATCH 1/2] piper-phonemize: 1.1.0 -> 2023.9.27-2 https://github.com/rhasspy/piper-phonemize/releases/tag/2023.9.27-2 --- .../libraries/piper-phonemize/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/piper-phonemize/default.nix b/pkgs/development/libraries/piper-phonemize/default.nix index fd1c1ae34b4c..af05a28b5b1c 100644 --- a/pkgs/development/libraries/piper-phonemize/default.nix +++ b/pkgs/development/libraries/piper-phonemize/default.nix @@ -17,8 +17,8 @@ let src = fetchFromGitHub { owner = "rhasspy"; repo = "espeak-ng"; - rev = "61504f6b76bf9ebbb39b07d21cff2a02b87c99ff"; - hash = "sha256-RBHL11L5uazAFsPFwul2QIyJREXk9Uz8HTZx9JqmyIQ="; + rev = "0f65aa301e0d6bae5e172cc74197d32a6182200f"; + hash = "sha256-2V0D3QO+v9OqffpNmwJQd3NIBd/IFeLkjaJ3Y0HHw7E="; }; patches = [ @@ -28,13 +28,13 @@ let in stdenv.mkDerivation rec { pname = "piper-phonemize"; - version = "1.1.0"; + version = "2023.9.27-2"; src = fetchFromGitHub { owner = "rhasspy"; repo = "piper-phonemize"; - rev = "refs/tags/v${version}"; - hash = "sha256-cMer7CSLOXv3jc9huVA3Oy5cjXjOX9XuEXpIWau1BNQ="; + rev = "refs/tags/${version}"; + hash = "sha256-Rwl8D5ZX9sGdxEch+l7pXdbf4nPCuSfGrK5x/EQ+O60="; }; nativeBuildInputs = [ @@ -42,6 +42,11 @@ stdenv.mkDerivation rec { pkg-config ]; + cmakeFlags = [ + "-DONNXRUNTIME_DIR=${onnxruntime.dev}" + "-DESPEAK_NG_DIR=${espeak-ng'}" + ]; + buildInputs = [ espeak-ng' onnxruntime From 20550edf35252dd38d81a52301a60d05a48224a0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 23 Oct 2023 01:06:42 +0200 Subject: [PATCH 2/2] piper-tts: 1.2.0 -> 2023.9.27-1 https://github.com/rhasspy/piper/releases/tag/2023.9.9-1 https://github.com/rhasspy/piper/releases/tag/2023.9.27-1 --- pkgs/tools/audio/piper/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/audio/piper/default.nix b/pkgs/tools/audio/piper/default.nix index d753d7bb3e1e..d68ffa2b77ea 100644 --- a/pkgs/tools/audio/piper/default.nix +++ b/pkgs/tools/audio/piper/default.nix @@ -7,6 +7,7 @@ , pkg-config # runtime +, fmt , onnxruntime , pcaudiolib , piper-phonemize @@ -18,22 +19,26 @@ stdenv.mkDerivation (finalAttrs: { pname = "piper"; - version = "1.2.0"; + version = "2023.9.27-1"; src = fetchFromGitHub { owner = "rhasspy"; repo = "piper"; - rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-6WNWqJt0PO86vnf+3iHaRRg2KwBOEj4aicmB+P2phlk="; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-U7yOiqNvE0WqZB8qaKf3U7gnTJ6q+9W5lviW79b6h/o="; }; - sourceRoot = "${finalAttrs.src.name}/src/cpp"; - nativeBuildInputs = [ cmake pkg-config ]; + cmakeFlags = [ + "-DFMT_DIR=${fmt}" + "-DSPDLOG_DIR=${spdlog.src}" + "-DPIPER_PHONEMIZE_DIR=${piper-phonemize}" + ]; + buildInputs = [ onnxruntime pcaudiolib