From e560040c19a101e73fcabdf4950659d011d7b5a9 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Fri, 18 Apr 2025 17:21:39 +0200 Subject: [PATCH 1/4] python3Packages.encodec: replace torch{,audio}-bin with torch{,audio} --- pkgs/development/python-modules/encodec/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/encodec/default.nix b/pkgs/development/python-modules/encodec/default.nix index 6c8c363e75ec..2e271b643bac 100644 --- a/pkgs/development/python-modules/encodec/default.nix +++ b/pkgs/development/python-modules/encodec/default.nix @@ -6,8 +6,8 @@ # dependencies einops, numpy, - torch-bin, - torchaudio-bin, + torch, + torchaudio, }: buildPythonPackage rec { @@ -25,8 +25,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ einops numpy - torch-bin - torchaudio-bin + torch + torchaudio ]; pythonImportsCheck = [ "encodec" ]; From 3eb5b4fbbddf035dd45390a26d902f78878c7839 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Fri, 18 Apr 2025 17:23:45 +0200 Subject: [PATCH 2/4] tts: replace torch{,audio}-bin with torch{,audio} --- pkgs/by-name/tt/tts/package.nix | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/pkgs/by-name/tt/tts/package.nix b/pkgs/by-name/tt/tts/package.nix index 89ffb9f86f99..0ca185eec217 100644 --- a/pkgs/by-name/tt/tts/package.nix +++ b/pkgs/by-name/tt/tts/package.nix @@ -8,17 +8,7 @@ writableTmpDirAsHomeHook, }: -let - python = python3.override { - self = python; - packageOverrides = self: super: { - torch = super.torch-bin; - torchvision = super.torchvision-bin; - tensorflow = super.tensorflow-bin; - }; - }; -in -python.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "coqui-tts"; version = "0.25.1"; pyproject = true; @@ -55,7 +45,7 @@ python.pkgs.buildPythonApplication rec { pyproject.toml ''; - nativeBuildInputs = with python.pkgs; [ + nativeBuildInputs = with python3.pkgs; [ cython numpy packaging @@ -63,7 +53,7 @@ python.pkgs.buildPythonApplication rec { hatchling ]; - propagatedBuildInputs = with python.pkgs; [ + propagatedBuildInputs = with python3.pkgs; [ anyascii bangla bnnumerizer @@ -92,8 +82,8 @@ python.pkgs.buildPythonApplication rec { scipy soundfile tensorflow - torch-bin - torchaudio-bin + torch + torchaudio tqdm trainer transformers @@ -104,7 +94,7 @@ python.pkgs.buildPythonApplication rec { ]; postInstall = '' - cp -r TTS/server/templates/ $out/${python.sitePackages}/TTS/server + cp -r TTS/server/templates/ $out/${python3.sitePackages}/TTS/server ''; # tests get stuck when run in nixpkgs-review, tested in passthru @@ -114,7 +104,7 @@ python.pkgs.buildPythonApplication rec { }); nativeCheckInputs = - with python.pkgs; + with python3.pkgs; [ espeak-ng pytestCheckHook @@ -130,7 +120,7 @@ python.pkgs.buildPythonApplication rec { for file in $(grep -rl 'python TTS/bin' tests); do substituteInPlace "$file" \ - --replace "python TTS/bin" "${python.interpreter} $out/${python.sitePackages}/TTS/bin" + --replace "python TTS/bin" "${python3.interpreter} $out/${python3.sitePackages}/TTS/bin" done ''; @@ -189,7 +179,7 @@ python.pkgs.buildPythonApplication rec { ]; passthru = { - inherit python; + inherit python3; }; meta = with lib; { @@ -198,6 +188,5 @@ python.pkgs.buildPythonApplication rec { description = "Deep learning toolkit for Text-to-Speech, battle-tested in research and production"; license = licenses.mpl20; maintainers = teams.tts.members; - broken = false; }; } From 62aec1000c133d68c7476b7fef0875cf29c1a5b7 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Fri, 18 Apr 2025 17:26:38 +0200 Subject: [PATCH 3/4] tts: 0.25.1 -> 0.26.0 --- pkgs/by-name/tt/tts/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/tt/tts/package.nix b/pkgs/by-name/tt/tts/package.nix index 0ca185eec217..694d1901f376 100644 --- a/pkgs/by-name/tt/tts/package.nix +++ b/pkgs/by-name/tt/tts/package.nix @@ -10,20 +10,21 @@ python3.pkgs.buildPythonApplication rec { pname = "coqui-tts"; - version = "0.25.1"; + version = "0.26.0"; pyproject = true; src = fetchFromGitHub { owner = "idiap"; repo = "coqui-ai-TTS"; tag = "v${version}"; - hash = "sha256-5w1Y9wdoJ+EV/WBwK3nqyY60NEsMjQsfE4g+sJB7VwQ="; + hash = "sha256-tLTurOwSzKvejb31yijmH3LFZGJHYp0OW0ckS7Ds5ig="; }; postPatch = let relaxedConstraints = [ "bnunicodenormalizer" + "coqpit-config" "cython" "gruut" "inflect" From b2b9ed39dbeb950102198a579935a6c7a1af8132 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Fri, 18 Apr 2025 18:10:45 +0200 Subject: [PATCH 4/4] python3Packages.spacy: 3.8.3 -> 3.8.5 --- pkgs/development/python-modules/spacy/default.nix | 6 ++---- pkgs/top-level/python-packages.nix | 13 +------------ 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index cbd02ae018a7..a773e1cb7a93 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -38,14 +38,12 @@ buildPythonPackage rec { pname = "spacy"; - version = "3.8.3"; + version = "3.8.5"; pyproject = true; - disabled = pythonOlder "3.10"; - src = fetchPypi { inherit pname version; - hash = "sha256-galn3D1qWgqaslBVlIP+IJIwZYKpGS+Yvnpjvc4nl/c="; + hash = "sha256-OLyLh3+yT0FJBf8XliADFgfNMf5vkA1noGcwFCcVZRw="; }; postPatch = '' diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 155c29d3b09a..7adbd8880ee8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16106,18 +16106,7 @@ self: super: with self; { soxr = callPackage ../development/python-modules/soxr { libsoxr = pkgs.soxr; }; - spacy = callPackage ../development/python-modules/spacy { - # fix error: ‘_PyCFrame’ has no member named ‘use_tracing’ - # see: https://aur.archlinux.org/packages/python-spacy - cython_0 = cython_0.overridePythonAttrs (old: rec { - version = "0.29.37"; - src = pkgs.fetchPypi { - pname = "Cython"; - inherit version; - hash = "sha256-+BPUpt2Ure5dT/JmGR0dlb9tQWSk+sxTVCLAIbJQTPs="; - }; - }); - }; + spacy = callPackage ../development/python-modules/spacy { }; spacy-alignments = callPackage ../development/python-modules/spacy-alignments { };