Merge pull request #301269 from fabaff/holidays-bump

python312Packages.holidays: 0.44 -> 0.46

3 files changed, 70 insertions, 36 deletions

diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix
index 0ed4d2555673a..d194a28123f84 100644
--- a/pkgs/development/python-modules/holidays/default.nix
+++ b/pkgs/development/python-modules/holidays/default.nix
@@ -1,27 +1,20 @@
-{ lib
-, buildPythonPackage
-, fetchFromGitHub
-, pythonOlder
-
-# build-system
-, setuptools
-
-# l10n
-, polib
-, lingua
-, chameleon
-
-# dependencies
-, python-dateutil
-
-# tests
-, importlib-metadata
-, pytestCheckHook
+{
+  lib,
+  buildPythonPackage,
+  chameleon,
+  fetchFromGitHub,
+  importlib-metadata,
+  lingva,
+  polib,
+  pytestCheckHook,
+  python-dateutil,
+  pythonOlder,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "holidays";
-  version = "0.44";
+  version = "0.46";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -30,14 +23,14 @@ buildPythonPackage rec {
     owner = "vacanza";
     repo = "python-holidays";
     rev = "refs/tags/v${version}";
-    hash = "sha256-RwM4RtFIUSaM/e4kiHOMg97lZ4VknB1pOqGRuIe2ns8=";
+    hash = "sha256-v0tufmOtxUP5pTsNNJJ9fevCPnsa68e0mdDtKGXEgVs=";
   };
 
-  nativeBuildInputs = [
+  build-system = [
     setuptools
 
     # l10n
-    lingua
+    lingva
     chameleon
     polib
   ];
@@ -52,9 +45,7 @@ buildPythonPackage rec {
     ./scripts/l10n/generate_mo_files.py
   '';
 
-  propagatedBuildInputs = [
-    python-dateutil
-  ];
+  dependencies = [ python-dateutil ];
 
   doCheck = false;
 
@@ -64,21 +55,16 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  pythonImportsCheck = [
-    "holidays"
-  ];
-
-  disabledTests = [
-    # Failure starting with 0.24
-    "test_l10n"
-  ];
+  pythonImportsCheck = [ "holidays" ];
 
   meta = with lib; {
     description = "Generate and work with holidays in Python";
     homepage = "https://github.com/vacanza/python-holidays";
     changelog = "https://github.com/vacanza/python-holidays/releases/tag/v${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ fab jluttine ];
+    maintainers = with maintainers; [
+      fab
+      jluttine
+    ];
   };
 }
-
diff --git a/pkgs/development/python-modules/lingva/default.nix b/pkgs/development/python-modules/lingva/default.nix
new file mode 100644
index 0000000000000..95bd168c39d01
--- /dev/null
+++ b/pkgs/development/python-modules/lingva/default.nix
@@ -0,0 +1,46 @@
+{
+  lib,
+  buildPythonPackage,
+  chameleon,
+  click,
+  fetchFromGitHub,
+  polib,
+  pytestCheckHook,
+  pythonOlder,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "lingva";
+  version = "5.0.2";
+  pyproject = true;
+
+  disabled = pythonOlder "3.7";
+
+  src = fetchFromGitHub {
+    owner = "vacanza";
+    repo = "lingva";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-kr64L/DtEWZu9z2p90QJHnb/6LygwZgxE+rARbo0NYI=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    chameleon
+    click
+    polib
+  ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  pythonImportsCheck = [ "lingva" ];
+
+  meta = with lib; {
+    description = "Module with tools to extract translatable texts from your code";
+    homepage = "https://github.com/vacanza/lingva";
+    changelog = "https://github.com/vacanza/lingva/blob/${version}/changes.rst";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1b0a2b5aaf06f..c5fa811082837 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6737,6 +6737,8 @@ self: super: with self; {
 
   lingua = callPackage ../development/python-modules/lingua { };
 
+  lingva = callPackage ../development/python-modules/lingva { };
+
   linien-client = callPackage ../development/python-modules/linien-client { };
 
   linien-common = callPackage ../development/python-modules/linien-common { };