piper-tts: rename from larynx

and also the python package piper-train from larynx-train.

pkgs/development/python-modules/piper-train/default.nix

@@ -1,6 +1,5 @@
-{ lib
+{ buildPythonPackage
-, buildPythonPackage
+, piper-tts
-, larynx
 
 # build
 , cython
@@ -15,10 +14,10 @@
 , torch
 }:
 
-buildPythonPackage rec {
+buildPythonPackage {
-  inherit (larynx) version src meta;
+  inherit (piper-tts) version src meta;
 
-  pname = "larynx-train";
+  pname = "piper-train";
   format = "setuptools";
 
   sourceRoot = "source/src/python";
@@ -35,13 +34,13 @@ buildPythonPackage rec {
   '';
 
   postBuild = ''
-    make -C larynx_train/vits/monotonic_align
+    make -C piper_train/vits/monotonic_align
   '';
 
   postInstall = ''
-    export MONOTONIC_ALIGN=$out/${python.sitePackages}/larynx_train/vits/monotonic_align/monotonic_align
+    export MONOTONIC_ALIGN=$out/${python.sitePackages}/piper_train/vits/monotonic_align/monotonic_align
     mkdir -p $MONOTONIC_ALIGN
-    cp -v ./larynx_train/vits/monotonic_align/larynx_train/vits/monotonic_align/core.*.so $MONOTONIC_ALIGN/
+    cp -v ./piper_train/vits/monotonic_align/piper_train/vits/monotonic_align/core.*.so $MONOTONIC_ALIGN/
   '';
 
   propagatedBuildInputs = [
@@ -54,7 +53,7 @@ buildPythonPackage rec {
   ];
 
   pythonImportsCheck = [
-    "larynx_train"
+    "piper_train"
   ];
 
   doCheck = false; # no tests

pkgs/tools/audio/piper/default.nix

@@ -6,11 +6,11 @@
 , espeak-ng
 , onnxruntime
 , pcaudiolib
-, larynx-train
+, piper-train
 }:
 
 let
-  pname = "larynx";
+  pname = "piper";
   version = "0.0.2";
 in
 stdenv.mkDerivation {
@@ -18,9 +18,9 @@ stdenv.mkDerivation {
 
   src = fetchFromGitHub {
     owner = "rhasspy";
-    repo = "larynx2";
+    repo = "piper";
-    rev = "refs/tags/v${version}";
+    rev = "70afec58bc131010c8993c154ff02a78d1e7b8b0";
-    hash = "sha256-6SZ1T2A1DyVmBH2pJBHJdsnniRuLrI/dthRTRRyVSQQ=";
+    hash = "sha256-zTW7RGcV8Hh7G6Braf27F/8s7nNjAqagp7tmrKO10BY=";
   };
 
   sourceRoot = "source/src/cpp";
@@ -45,19 +45,19 @@ stdenv.mkDerivation {
     runHook preInstall
 
     mkdir -p $out/bin
-    install -m 0755 larynx $out/bin
+    install -m 0755 piper $out/bin
 
     runHook postInstall
   '';
 
   passthru.tests = {
-    inherit larynx-train;
+    inherit piper-train;
   };
 
   meta = with lib; {
-    changelog = "https://github.com/rhasspy/larynx2/releases/tag/v${version}";
+    changelog = "https://github.com/rhasspy/piper/releases/tag/v${version}";
     description = "A fast, local neural text to speech system";
-    homepage = "https://github.com/rhasspy/larynx2";
+    homepage = "https://github.com/rhasspy/piper";
     license = licenses.mit;
     maintainers = with maintainers; [ hexa ];
   };

pkgs/top-level/aliases.nix

@@ -832,6 +832,7 @@ mapAliases ({
 
   ### L ###
 
+  larynx = piper-tts; # Added 2023-05-09
   lastfmsubmitd = throw "lastfmsubmitd was removed from nixpkgs as the project is abandoned"; # Added 2022-01-01
   latinmodern-math = lmmath;
   letsencrypt = throw "'letsencrypt' has been renamed to/replaced by 'certbot'"; # Converted to throw 2022-02-22

pkgs/top-level/all-packages.nix

@@ -9685,10 +9685,6 @@ with pkgs;
 
   jump = callPackage ../tools/system/jump { };
 
-  larynx = callPackage ../tools/audio/larynx { };
-
-  larynx-train = with python3Packages; toPythonApplication larynx-train;
-
   latex2html = callPackage ../tools/misc/latex2html { };
 
   lazycli = callPackage ../tools/misc/lazycli { };
@@ -11316,6 +11312,9 @@ with pkgs;
 
   pim6sd = callPackage ../servers/pim6sd { };
 
+  piper-train = with python3Packages; toPythonApplication piper-train;
+  piper-tts = callPackage ../tools/audio/piper { };
+
   phosh = callPackage ../applications/window-managers/phosh { };
 
   phosh-mobile-settings = callPackage ../applications/window-managers/phosh/phosh-mobile-settings.nix { };

pkgs/top-level/python-aliases.nix

@@ -158,6 +158,7 @@ mapAliases ({
   jupyter_server = jupyter-server; # added 2023-01-05
   Kajiki = kajiki; # added 2023-02-19
   Keras = keras; # added 2021-11-25
+  larynx-train = piper-train; # added 2023-06-09
   ldap = python-ldap; # added 2022-09-16
   lammps-cython = throw "lammps-cython no longer builds and is unmaintained"; # added 2021-07-04
   logilab_astng = throw "logilab-astng has not been released since 2013 and is unmaintained"; # added 2022-11-29

pkgs/top-level/python-packages.nix

@@ -5536,8 +5536,6 @@ self: super: with self; {
 
   lark = callPackage ../development/python-modules/lark { };
 
-  larynx-train = callPackage ../development/python-modules/larynx-train { };
-
   laspy = callPackage ../development/python-modules/laspy { };
 
   laszip = callPackage ../development/python-modules/laszip { };
@@ -7643,6 +7641,8 @@ self: super: with self; {
 
   pipenv-poetry-migrate = callPackage ../development/python-modules/pipenv-poetry-migrate { };
 
+  piper-train = callPackage ../development/python-modules/piper-train { };
+
   pip-api = callPackage ../development/python-modules/pip-api { };
 
   pip-tools = callPackage ../development/python-modules/pip-tools { };