diff --git a/pkgs/development/python-modules/recurring-ical-events/default.nix b/pkgs/development/python-modules/recurring-ical-events/default.nix index 6f6df628d0fb..04d83dff0966 100644 --- a/pkgs/development/python-modules/recurring-ical-events/default.nix +++ b/pkgs/development/python-modules/recurring-ical-events/default.nix @@ -1,9 +1,10 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, - setuptools, + git, + hatch-vcs, + hatchling, icalendar, python-dateutil, tzdata, @@ -16,20 +17,25 @@ buildPythonPackage rec { pname = "recurring-ical-events"; - version = "3.4.1"; - - disabled = pythonOlder "3.8"; - + version = "3.6.0"; pyproject = true; src = fetchFromGitHub { owner = "niccokunzmann"; repo = "python-recurring-ical-events"; tag = "v${version}"; - hash = "sha256-JhGKowFtRJwLj/5J1lNpgMTl1d+oWsmV4wI3hfOW5io="; + hash = "sha256-wfp/ubFZv54z2d44hvG56xcCjGedYqW/zeNvaoPPJYE="; }; - build-system = [ setuptools ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'dynamic = ["urls", "version"]' 'version = "${version}"' + ''; + + build-system = [ + hatch-vcs + hatchling + ]; dependencies = [ icalendar diff --git a/pkgs/development/python-modules/x-wr-timezone/default.nix b/pkgs/development/python-modules/x-wr-timezone/default.nix index 497ab9d2cd2a..32c7b83adef6 100644 --- a/pkgs/development/python-modules/x-wr-timezone/default.nix +++ b/pkgs/development/python-modules/x-wr-timezone/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "x-wr-timezone"; - version = "2.0.0"; + version = "2.0.1"; pyproject = true; src = fetchFromGitHub { owner = "niccokunzmann"; repo = "x-wr-timezone"; tag = "v${version}"; - hash = "sha256-F/bNETgscbhEkpG/D1eSJaBNdpi0+xEYuNL4RURGST0="; + hash = "sha256-Llpe3Z0Yfd0vRgx95D4YVrnNJk0g/VqPuNvtUrUpFk0="; }; build-system = [ setuptools ]; @@ -48,7 +48,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "x_wr_timezone" ]; meta = { - changelog = "https://github.com/niccokunzmann/x-wr-timezone/blob/${src.rev}/README.rst#changelog"; + changelog = "https://github.com/niccokunzmann/x-wr-timezone/blob/${src.tag}/README.rst#changelog"; description = "Convert calendars using X-WR-TIMEZONE to standard ones"; homepage = "https://github.com/niccokunzmann/x-wr-timezone"; license = lib.licenses.lgpl3Plus;