From 045bcfef4b976b364d9306db6679d4b62acef928 Mon Sep 17 00:00:00 2001 From: aske Date: Mon, 5 Sep 2016 03:29:24 +0300 Subject: [PATCH 1/6] maintainers: add aske --- lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 8c29c9b4cf2..9f0ba2767d3 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -40,6 +40,7 @@ arobyn = "Alexei Robyn "; artuuge = "Artur E. Ruuge "; ashalkhakov = "Artyom Shalkhakov "; + aske = "Kirill Boltaev "; asppsa = "Alastair Pharo "; astsmtl = "Alexander Tsamutali "; aszlig = "aszlig "; From 5b61020e056462ebe34d6580e43ea83a14894061 Mon Sep 17 00:00:00 2001 From: aske Date: Sun, 4 Sep 2016 23:44:45 +0300 Subject: [PATCH 2/6] speechd: 0.8.3 -> 0.8.5 --- pkgs/development/libraries/speechd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/speechd/default.nix b/pkgs/development/libraries/speechd/default.nix index 1a943be0fc2..ee45c0d1c65 100644 --- a/pkgs/development/libraries/speechd/default.nix +++ b/pkgs/development/libraries/speechd/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "speech-dispatcher-${version}"; - version = "0.8.3"; + version = "0.8.5"; src = fetchurl { url = "http://www.freebsoft.org/pub/projects/speechd/${name}.tar.gz"; - sha256 = "0kqy7z4l59n2anc7xn588w4rkacig1hajx8c53qrh90ypar978ln"; + sha256 = "18jlxnhlahyi6njc6l6576hfvmzivjjgfjyd2n7vvrvx9inphjrb"; }; buildInputs = [ intltool libtool glib dotconf libsndfile libao python3Packages.python ] From d6936f47db661e77404577ae19adee69abd56109 Mon Sep 17 00:00:00 2001 From: aske Date: Mon, 5 Sep 2016 02:32:31 +0300 Subject: [PATCH 3/6] pcaudiolib: init at 2016-07-19 --- .../libraries/pcaudiolib/default.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/libraries/pcaudiolib/default.nix diff --git a/pkgs/development/libraries/pcaudiolib/default.nix b/pkgs/development/libraries/pcaudiolib/default.nix new file mode 100644 index 00000000000..ccb7d4179df --- /dev/null +++ b/pkgs/development/libraries/pcaudiolib/default.nix @@ -0,0 +1,29 @@ +{ stdenv, lib, fetchFromGitHub, autoconf, automake, which, libtool, pkgconfig, + alsaLib, portaudio, + pulseaudioSupport ? true, libpulseaudio }: + +stdenv.mkDerivation rec { + name = "pcaudiolib-${version}"; + version = "2016-07-19"; + + src = fetchFromGitHub { + owner = "rhdunn"; + repo = "pcaudiolib"; + rev = "4f836ea909bdaa8a6e0e89c587efc745b546b459"; + sha256 = "0z99nh4ibb9md2cd21762n1dmv6jk988785s1cxd8lsy4hp4pwfa"; + }; + + nativeBuildInputs = [ autoconf automake which libtool pkgconfig ]; + + buildInputs = [ portaudio alsaLib ] ++ lib.optional pulseaudioSupport libpulseaudio; + + preConfigure = "./autogen.sh"; + + meta = with stdenv.lib; { + description = "Provides a C API to different audio devices"; + homepage = "https://github.com/rhdunn/pcaudiolib"; + license = licenses.gpl3; + maintainers = with maintainers; [ aske ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0102a4d97ec..a2efa372ede 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9015,6 +9015,10 @@ in pangoxsl = callPackage ../development/libraries/pangoxsl { }; + pcaudiolib = callPackage ../development/libraries/pcaudiolib { + pulseaudioSupport = config.pulseaudio or true; + }; + pcg_c = callPackage ../development/libraries/pcg-c { }; pcl = callPackage ../development/libraries/pcl { From 48884e06ccd6867406d27a912960a3642b9c7415 Mon Sep 17 00:00:00 2001 From: aske Date: Mon, 5 Sep 2016 02:37:52 +0300 Subject: [PATCH 4/6] sonic: init at 2016-03-01 --- pkgs/development/libraries/sonic/default.nix | 25 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/libraries/sonic/default.nix diff --git a/pkgs/development/libraries/sonic/default.nix b/pkgs/development/libraries/sonic/default.nix new file mode 100644 index 00000000000..f5927cb73e6 --- /dev/null +++ b/pkgs/development/libraries/sonic/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "sonic-${version}"; + version = "2016-03-01"; + + src = fetchFromGitHub { + owner = "waywardgeek"; + repo = "sonic"; + rev = "71bdf26c55716a45af50c667c0335a9519e952dd"; + sha256 = "1kcl8fdf92kafmfhvyjal5gvkn99brkjyzbi9gw3rd5b30m3xz2b"; + }; + + postPatch = '' + sed -i "s,^PREFIX=.*,PREFIX=$out," Makefile + ''; + + meta = with stdenv.lib; { + description = "Simple library to speed up or slow down speech"; + homepage = "https://github.com/waywardgeek/sonic"; + license = licenses.asl20; + maintainers = with maintainers; [ aske ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a2efa372ede..b40a0432b26 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9418,6 +9418,8 @@ in sofia_sip = callPackage ../development/libraries/sofia-sip { }; + sonic = callPackage ../development/libraries/sonic { }; + soprano = callPackage ../development/libraries/soprano { }; soqt = callPackage ../development/libraries/soqt { }; From a6ce0f80fb0b1525ed0a55e2feb02a00ae023ff1 Mon Sep 17 00:00:00 2001 From: aske Date: Mon, 5 Sep 2016 02:44:30 +0300 Subject: [PATCH 5/6] espeak-ng: init at 2016-08-28 --- pkgs/applications/audio/espeak-ng/default.nix | 35 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/applications/audio/espeak-ng/default.nix diff --git a/pkgs/applications/audio/espeak-ng/default.nix b/pkgs/applications/audio/espeak-ng/default.nix new file mode 100644 index 00000000000..cb2e15bc5b2 --- /dev/null +++ b/pkgs/applications/audio/espeak-ng/default.nix @@ -0,0 +1,35 @@ +{ stdenv, lib, fetchFromGitHub, autoconf, automake, which, libtool, pkgconfig +, ronn +, pcaudiolibSupport ? true, pcaudiolib +, sonicSupport ? true, sonic }: + +stdenv.mkDerivation rec { + name = "espeak-ng-${version}"; + version = "2016-08-28"; + + src = fetchFromGitHub { + owner = "espeak-ng"; + repo = "espeak-ng"; + rev = "b784e77c5708b61feed780d8f1113c4c8eb92200"; + sha256 = "1whix4mv0qvsvifgpwwbdzhv621as3rxpn9ijqc2683h6k8pvcfk"; + }; + + nativeBuildInputs = [ autoconf automake which libtool pkgconfig ronn ]; + + buildInputs = lib.optional pcaudiolibSupport pcaudiolib + ++ lib.optional sonicSupport sonic; + + preConfigure = "./autogen.sh"; + + postInstall = '' + patchelf --set-rpath "$(patchelf --print-rpath $out/bin/espeak-ng)" $out/bin/speak-ng + ''; + + meta = with stdenv.lib; { + description = "Open source speech synthesizer that supports over 70 languages, based on eSpeak"; + homepage = "https://github.com/espeak-ng/espeak-ng"; + license = licenses.gpl3; + maintainers = with maintainers; [ aske ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b40a0432b26..b5863ae40d6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12963,6 +12963,8 @@ in espeak = callPackage ../applications/audio/espeak { }; + espeak-ng = callPackage ../applications/audio/espeak-ng { }; + espeakedit = callPackage ../applications/audio/espeak/edit.nix { }; esniper = callPackage ../applications/networking/esniper { }; From f0cf058c130cdd0716e56107ff40b3873ad7715f Mon Sep 17 00:00:00 2001 From: aske Date: Mon, 5 Sep 2016 02:47:26 +0300 Subject: [PATCH 6/6] espeak-ng: use instead of espeak --- pkgs/top-level/all-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b5863ae40d6..0bd530b6067 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12961,9 +12961,10 @@ in pythonPackages = python3Packages; }; - espeak = callPackage ../applications/audio/espeak { }; + espeak-classic = callPackage ../applications/audio/espeak { }; espeak-ng = callPackage ../applications/audio/espeak-ng { }; + espeak = self.espeak-ng; espeakedit = callPackage ../applications/audio/espeak/edit.nix { };