diff --git a/pkgs/by-name/sv/svox/fix-compilation-darwin.patch b/pkgs/by-name/pi/picotts/fix-compilation-darwin.patch similarity index 100% rename from pkgs/by-name/sv/svox/fix-compilation-darwin.patch rename to pkgs/by-name/pi/picotts/fix-compilation-darwin.patch diff --git a/pkgs/by-name/pi/picotts/package.nix b/pkgs/by-name/pi/picotts/package.nix index cd3f9c3764e6..3c45f83304bd 100644 --- a/pkgs/by-name/pi/picotts/package.nix +++ b/pkgs/by-name/pi/picotts/package.nix @@ -2,38 +2,44 @@ lib, stdenv, fetchFromGitHub, - autoconf, - automake, - libtool, + autoreconfHook, popt, }: stdenv.mkDerivation (finalAttrs: { pname = "picotts"; - version = "0-unstable-2018-10-19"; + version = "0-unstable-2021-05-06"; src = fetchFromGitHub { + owner = "ihuguet"; repo = "picotts"; - owner = "naggety"; - rev = "2f86050dc5da9ab68fc61510b594d8e6975c4d2d"; - sha256 = "1k2mdv9llkh77jr4qr68yf0zgjqk87np35fgfmnc3rpdp538sccl"; + rev = "21089d223e177ba3cb7e385db8613a093dff74b5"; + sha256 = "sha256-NmmYa3mVUSMsLC1blFAET3zLY66anGY2ff6ZQ424h1s="; }; - nativeBuildInputs = [ - autoconf - automake + + patches = [ + # upstream PR: https://github.com/ihuguet/picotts/pull/14 + ./fix-compilation-darwin.patch ]; + + postPatch = '' + cd pico + ''; + + nativeBuildInputs = [ + autoreconfHook + ]; + buildInputs = [ - libtool popt ]; - sourceRoot = "${finalAttrs.src.name}/pico"; - preConfigure = "./autogen.sh"; + meta = { description = "Text to speech voice sinthesizer from SVox"; - homepage = "https://github.com/naggety/picotts"; + homepage = "https://github.com/ihuguet/picotts"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.canndrew ]; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; mainProgram = "pico2wave"; }; }) diff --git a/pkgs/by-name/sp/speechd/package.nix b/pkgs/by-name/sp/speechd/package.nix index cb10fc36fa1f..c18482000427 100644 --- a/pkgs/by-name/sp/speechd/package.nix +++ b/pkgs/by-name/sp/speechd/package.nix @@ -16,7 +16,6 @@ glib, dotconf, libsndfile, - runtimeShell, withLibao ? true, libao, withPulse ? false, @@ -32,7 +31,7 @@ pcaudiolib, mbrola, withPico ? true, - svox, + picotts, libsOnly ? false, }: @@ -100,7 +99,7 @@ stdenv.mkDerivation (finalAttrs: { flite ] ++ lib.optionals withPico [ - svox + picotts ]; pythonPath = [ @@ -134,7 +133,7 @@ stdenv.mkDerivation (finalAttrs: { ]; postPatch = lib.optionalString withPico '' - substituteInPlace src/modules/pico.c --replace "/usr/share/pico/lang" "${svox}/share/pico/lang" + substituteInPlace src/modules/pico.c --replace "/usr/share/pico/lang" "${picotts}/share/pico/lang" ''; installFlags = [ diff --git a/pkgs/by-name/sv/svox/package.nix b/pkgs/by-name/sv/svox/package.nix deleted file mode 100644 index 6c329a30c110..000000000000 --- a/pkgs/by-name/sv/svox/package.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - autoreconfHook, - popt, -}: - -stdenv.mkDerivation { - pname = "svox"; - version = "0-unstable-2021-05-06"; - - # basically took the source code from android and borrowed autotool patches from debian - src = fetchFromGitHub { - owner = "naggety"; - repo = "picotts"; - rev = "21089d223e177ba3cb7e385db8613a093dff74b5"; - hash = "sha256-NmmYa3mVUSMsLC1blFAET3zLY66anGY2ff6ZQ424h1s="; - }; - - patches = [ - # upstream PR: https://github.com/ihuguet/picotts/pull/14 - ./fix-compilation-darwin.patch - ]; - - postPatch = '' - cd pico - ''; - - buildInputs = [ popt ]; - - nativeBuildInputs = [ autoreconfHook ]; - - meta = { - description = "Text-to-speech engine"; - homepage = "https://android.googlesource.com/platform/external/svox"; - platforms = lib.platforms.unix; - license = lib.licenses.asl20; - maintainers = [ ]; - mainProgram = "pico2wave"; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c47699b58190..7bd18913e86f 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -2024,6 +2024,7 @@ mapAliases { superTux = warnAlias "'superTux' has been renamed to 'supertux'" supertux; # Added 2026-02-12 superTuxKart = warnAlias "'superTuxKart' has been renamed to 'supertuxkart'" supertuxkart; # Added 2026-02-12 surge-XT = warnAlias "'surge-XT' has been renamed to 'surge-xt'" surge-xt; # Added 2026-02-12 + svox = warnAlias "'svox' has been renamed to/replaced by 'picotts'" picotts; # Added 2026-03-04 svt-av1-psy = warnAlias "'svt-av1-psy' has been replaced by 'svt-av1-psyex'" svt-av1-psyex; # Added 2026-01-10 swagger-cli = throw "'swagger-cli' has been removed as it is broken and unmaintained. Upstream suggests using 'redocly' instead"; # Added 2026-04-23 swig4 = throw "'swig4' has been renamed to/replaced by 'swig'"; # Converted to throw 2025-10-27