From 507d96d35e091f4b5ce751b8f2aedc479e44cf24 Mon Sep 17 00:00:00 2001
From: SLNOS <anonymous@wired>
Date: Thu, 1 Mar 2018 00:00:00 +0000
Subject: [PATCH] speech-tools: 2.1 -> 2.4, unbreak
---
pkgs/development/libraries/speech-tools/default.nix | 11 ++++-------
pkgs/top-level/all-packages.nix | 3 ++-
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/pkgs/development/libraries/speech-tools/default.nix b/pkgs/development/libraries/speech-tools/default.nix
index fba354213556..9113a1efb15c 100644
--- a/pkgs/development/libraries/speech-tools/default.nix
+++ b/pkgs/development/libraries/speech-tools/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "speech_tools-${version}";
- version = "2.1";
+ version = "2.4";
src = fetchurl {
url = "http://www.festvox.org/packed/festival/${version}/${name}-release.tar.gz";
- sha256 = "1s9bkfgdgyas8v2cr7x3dg0ck1xf9mn1q6a73gwy524sjb6nfqgz";
+ sha256 = "043h4fxfiiqxgwvyyyasylypjkpfzajxd6g5s9wsl69r8hn4ihpv";
};
buildInputs = [ alsaLib ncurses ];
@@ -27,15 +27,12 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- broken = true;
description = "Text-to-speech engine";
- maintainers = with maintainers;
- [
- raskin
- ];
+ maintainers = with maintainers; [ raskin ];
platforms = platforms.linux;
license = licenses.free;
};
+
passthru = {
updateInfo = {
downloadPage = "http://www.festvox.org/packed/festival/";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e501b1d92069..cd14c1890b0a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11400,7 +11400,8 @@ with pkgs;
speechd = callPackage ../development/libraries/speechd { };
- speech_tools = callPackage ../development/libraries/speech-tools {};
+ speech-tools = callPackage ../development/libraries/speech-tools {};
+ speech_tools = speech-tools;
speex = callPackage ../development/libraries/speex {
fftw = fftwFloat;