From 025ea35c2b6880bda218b89262233de925bac18a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 22 Aug 2023 09:08:16 +0200 Subject: [PATCH 1/2] python311Packages.holidays: add myself as maintainer --- pkgs/development/python-modules/holidays/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix index 976766f0a4df..94ba314a5300 100644 --- a/pkgs/development/python-modules/holidays/default.nix +++ b/pkgs/development/python-modules/holidays/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { homepage = "https://github.com/dr-prodigy/python-holidays"; changelog = "https://github.com/dr-prodigy/python-holidays/releases/tag/v.${version}"; license = licenses.mit; - maintainers = with maintainers; [ jluttine ]; + maintainers = with maintainers; [ fab jluttine ]; }; } From c3aa47061466cd306139e4fdef2f2d87d1ad073a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 Nov 2023 14:20:20 +0100 Subject: [PATCH 2/2] python311Packages.holidays: 0.32 -> 0.35 Changelog: https://github.com/vacanza/python-holidays/releases/tag/v0.35 --- .../python-modules/holidays/default.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix index 94ba314a5300..9fd25d7e138c 100644 --- a/pkgs/development/python-modules/holidays/default.nix +++ b/pkgs/development/python-modules/holidays/default.nix @@ -3,27 +3,33 @@ , convertdate , fetchFromGitHub , hijri-converter +, importlib-metadata , korean-lunar-calendar , polib , pytestCheckHook , python-dateutil , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "holidays"; - version = "0.32"; - format = "setuptools"; + version = "0.35"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "dr-prodigy"; repo = "python-holidays"; - rev = "refs/tags/v.${version}"; - hash = "sha256-YAh5gR4KcUgXzeXy3xyGeokDFsyd9FqRQ5j1TC6wCQY="; + rev = "refs/tags/v${version}"; + hash = "sha256-FrAqVLyEtjhpiu1XdFY5yOstKKjXhRTv9PeaFlJaf8k="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ convertdate python-dateutil @@ -32,6 +38,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + importlib-metadata polib pytestCheckHook ]; @@ -48,7 +55,7 @@ buildPythonPackage rec { meta = with lib; { description = "Generate and work with holidays in Python"; homepage = "https://github.com/dr-prodigy/python-holidays"; - changelog = "https://github.com/dr-prodigy/python-holidays/releases/tag/v.${version}"; + changelog = "https://github.com/dr-prodigy/python-holidays/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab jluttine ]; };