Merge pull request #325020 from mweinelt/gruut-2.4.0

python312Packages.gruut: 2.3.4 -> 2.4.0

pkgs/development/python-modules/gruut/default.nix

@@ -9,12 +9,17 @@
 
   # dependencies
   babel,
-  gruut-ipa,
   dateparser,
+  gruut-ipa,
   jsonlines,
-  num2words,
-  python-crfsuite,
   networkx,
+  num2words,
+  numpy,
+  python-crfsuite,
+
+  # optional dependencies
+  pydub,
+  rapidfuzz,
 
   # checks
   glibcLocales,
@@ -24,6 +29,7 @@
 let
   langPkgs = [
     "ar"
+    "ca"
     "cs"
     "de"
     "en"
@@ -41,46 +47,53 @@ let
 in
 buildPythonPackage rec {
   pname = "gruut";
-  version = "2.3.4";
+  version = "2.4.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "rhasspy";
     repo = "gruut";
     rev = "refs/tags/v${version}";
-    hash = "sha256-DD7gnvH9T2R6E19+exWE7Si+XEpfh0Iy5FYbycjgzgM=";
+    hash = "sha256-iwde6elsAbICZ+Rc7CPgcZTOux1hweVZc/gf4K+hP9M=";
   };
 
   pythonRelaxDeps = true;
 
   build-system = [ setuptools ];
 
-  dependencies =
+  dependencies = [
-    [
+    babel
-      babel
+    dateparser
-      gruut-ipa
+    gruut-ipa
-      jsonlines
+    jsonlines
-      num2words
+    networkx
-      python-crfsuite
+    num2words
-      dateparser
+    numpy
-      networkx
+    python-crfsuite
-    ]
+  ] ++ optional-dependencies.en;
-    ++ (map (
+
-      lang:
+  optional-dependencies =
-      callPackage ./language-pack.nix {
+    {
+      train = [
+        pydub
+        rapidfuzz
+      ];
+    }
+    // lib.genAttrs langPkgs (lang: [
+      (callPackage ./language-pack.nix {
         inherit
           lang
           version
           src
           build-system
           ;
-      }
+      })
-    ) langPkgs);
+    ]);
 
   nativeCheckInputs = [
     glibcLocales
     pytestCheckHook
-  ];
+  ] ++ lib.flatten (lib.attrValues optional-dependencies);
 
   disabledTests = [
     # https://github.com/rhasspy/gruut/issues/25
@@ -89,7 +102,6 @@ buildPythonPackage rec {
     # requires mishkal library
     "test_fa"
     "test_ar"
-    "test_lb"
   ];
 
   preCheck = ''