tts: 2020-06-06 -> 2020-04-23

mweinelt · Jun 13, 2020 · b373a18 · b373a18
1 parent 8f978e3
commit b373a18
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 24 deletions.
diff --git a/pkgs/development/python-modules/tts/default.nix b/pkgs/development/python-modules/tts/default.nix
@@ -1,21 +1,46 @@
-{ lib, pkgs, python3Packages, fetchFromGitHub }:
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, phonemizer
+, tensorboardx
+, matplotlib
+, scipy
+, pytorch
+, flask
+, attrdict
+, bokeh
+, soundfile
+, tqdm
+, librosa
+, unidecode
+, fetchpatch
+}:
 
-python3Packages.buildPythonApplication rec {
+buildPythonPackage rec {
   pname = "tts";
-  version = "unstable-2020-06-06";
+  # until https://github.com/mozilla/TTS/issues/424 is resolved
+  # we treat released models as released versions:
+  # https://github.com/mozilla/TTS/wiki/Released-Models
+  version = "unstable-2020-04-23";
 
   src = fetchFromGitHub {
     owner = "mozilla";
     repo = "TTS";
-    rev = "1d3c0c88467d01e114063b54279693b464ac656a";
-    sha256 = "1xjwlr0sw8l7rnp0acbs1v3s2l21cl12mxfhx2xk1nwi7v0brb21";
+    rev = "53b24625a7b898447b0cda2929503b96752d9eae";
+    sha256 = "1mcv3lfpr6dfy57af1ysf6dv6q8l7xq3b6iim10z9rn2zqsklbxf";
   };
 
   patches = [
     ./loosen-deps.patch
+    # add tts-server executable
+    # https://github.com/mozilla/TTS/pull/425
+    (fetchpatch {
+      url = "https://github.com/mozilla/TTS/commit/edf257a91363c4c58b6e1c9e1a9e7f3b0b37dd17.patch";
+      sha256 = "087hj13f9kf31i2nvwhkdx37y3qwgdxayzfpv0am5b3f5alsr6xb";
+    })
   ];
 
-  propagatedBuildInputs = with python3Packages; [
+  propagatedBuildInputs = [
     matplotlib
     scipy
     pytorch
@@ -26,12 +51,12 @@ python3Packages.buildPythonApplication rec {
     tqdm
     librosa
     unidecode
-  ] ++ (with pkgs; [ 
     phonemizer
     tensorboardx
-  ]);
+  ];
 
   preBuild = ''
+    # numba jit tries to write to its cache directory
     export HOME=$TMPDIR
   '';
 

diff --git a/pkgs/development/python-modules/tts/loosen-deps.patch b/pkgs/development/python-modules/tts/loosen-deps.patch
@@ -1,23 +1,15 @@
-diff --git a/requirements.txt b/requirements.txt
-index 862cb22..403b702 100644
---- a/requirements.txt
-+++ b/requirements.txt
-@@ -11,4 +11,4 @@ scipy
- tqdm
- soundfile
- phonemizer
--bokeh==1.4.0
-+bokeh
 diff --git a/setup.py b/setup.py
-index a784056..3c1d96d 100644
+index f92dac8..fa4a11f 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -94,8 +94,8 @@ setup(
+@@ -93,9 +93,9 @@ setup(
+     install_requires=[
          "scipy>=0.19.0",
-         "torch>=1.5",
-         "numpy>=1.16.0",
+         "torch>=0.4.1",
+-        "numpy==1.15.4",
 -        "librosa==0.6.2",
 -        "unidecode==0.4.20",
++        "numpy>=1.15.4",
 +        "librosa>=0.6.2",
 +        "unidecode>=0.4.20",
          "attrdict",
@@ -28,7 +20,7 @@ index a784056..3c1d96d 100644
          # "lws",
          "tqdm",
 -        "bokeh==1.4.0",
-+        "bokeh",
++        "bokeh>=1.4.0",
          "soundfile",
          "phonemizer @ https://github.com/bootphon/phonemizer/tarball/master",
      ],
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -24238,7 +24238,7 @@ in
 
   tremulous = callPackage ../games/tremulous { };
 
-  tts = callPackage ../applications/audio/tts { };
+  tts = python3.pkgs.toPythonApplication python3.pkgs.tts;
 
   tuxpaint = callPackage ../games/tuxpaint { };
 

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
@@ -5994,6 +5994,8 @@ in {
 
   transaction = callPackage ../development/python-modules/transaction { };
 
+  tts = callPackage ../development/python-modules/tts { };
+
   TurboCheetah = callPackage ../development/python-modules/TurboCheetah { };
 
   tweepy = callPackage ../development/python-modules/tweepy { };