From 473c1988ab0e3760a5dd48acf9256a127f7a4d96 Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Fri, 28 Feb 2025 14:06:02 +0100 Subject: [PATCH 1/4] python3Packages.icalendar-compatibility: init at 0.1.4 --- .../icalendar-compatibility/default.nix | 53 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 55 insertions(+) create mode 100644 pkgs/development/python-modules/icalendar-compatibility/default.nix diff --git a/pkgs/development/python-modules/icalendar-compatibility/default.nix b/pkgs/development/python-modules/icalendar-compatibility/default.nix new file mode 100644 index 000000000000..b5969bcca32b --- /dev/null +++ b/pkgs/development/python-modules/icalendar-compatibility/default.nix @@ -0,0 +1,53 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + hatchling, + hatch-vcs, + icalendar, + pytestCheckHook, + git, +}: + +buildPythonPackage rec { + pname = "icalendar-compatibility"; + version = "0.1.4"; + pyproject = true; + + src = fetchFromGitHub { + owner = "niccokunzmann"; + repo = "icalendar_compatibility"; + tag = "v${version}"; + hash = "sha256-h9rpbltNEPMteicPJ6oC32NsZS8QXQphLbC0Qiu7j5Q="; + }; + + # hatch-vcs tries to read the current git commit hash + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'dynamic = ["urls", "version"]' 'version = "${version}"' + ''; + + build-system = [ + hatchling + hatch-vcs + ]; + + dependencies = [ icalendar ]; + + nativeCheckInputs = [ + pytestCheckHook + git + ]; + + pythonImportsCheck = [ "icalendar_compatibility" ]; + + # env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + + meta = { + homepage = "https://icalendar-compatibility.readthedocs.io/en/latest/"; + changelog = "https://icalendar-compatibility.readthedocs.io/en/latest/changes.html"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ erictapen ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0c046157350e..391b9ced629c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6306,6 +6306,8 @@ self: super: with self; { icalendar = callPackage ../development/python-modules/icalendar { }; + icalendar-compatibility = callPackage ../development/python-modules/icalendar-compatibility { }; + icalevents = callPackage ../development/python-modules/icalevents { }; icecream = callPackage ../development/python-modules/icecream { }; From 4483e78ccb1268822ae7f01e72f2df92773dd022 Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Fri, 28 Feb 2025 14:21:18 +0100 Subject: [PATCH 2/4] python3Packages.x-wr-timezone: 2.0.0 -> 2.0.1 Diff: https://github.com/niccokunzmann/x-wr-timezone/compare/refs/tags/v2.0.0...v2.0.1 Changelog: https://github.com/niccokunzmann/x-wr-timezone/blob/refs/tags/v2.0.1/README.rst#changelog --- pkgs/development/python-modules/x-wr-timezone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/x-wr-timezone/default.nix b/pkgs/development/python-modules/x-wr-timezone/default.nix index 497ab9d2cd2a..0cfbc02b2641 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 ]; From 56d7ffe96dc1f556d11ce53207f2d41263e88d83 Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Fri, 28 Feb 2025 14:20:39 +0100 Subject: [PATCH 3/4] python3Packages.mergecal: init at 0.5.0 --- .../python-modules/mergecal/default.nix | 48 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 50 insertions(+) create mode 100644 pkgs/development/python-modules/mergecal/default.nix diff --git a/pkgs/development/python-modules/mergecal/default.nix b/pkgs/development/python-modules/mergecal/default.nix new file mode 100644 index 000000000000..25d038f02b36 --- /dev/null +++ b/pkgs/development/python-modules/mergecal/default.nix @@ -0,0 +1,48 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + icalendar, + rich, + typer, + x-wr-timezone, + pytestCheckHook, + pytest-cov-stub, +}: + +buildPythonPackage rec { + pname = "mergecal"; + version = "0.5.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "mergecal"; + repo = "python-mergecal"; + tag = "v${version}"; + hash = "sha256-Je3gFREu97Ycofszhr6pKOCiK76oBuzb3ji4LAf5aE8="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + icalendar + rich + typer + x-wr-timezone + ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-cov-stub + ]; + + pythonImportChecks = [ "mergecal" ]; + + meta = { + homepage = "https://mergecal.readthedocs.io/en/latest/"; + changelog = "https://github.com/mergecal/python-mergecal/blob/${src.tag}/CHANGELOG.md"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ erictapen ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 391b9ced629c..8f71f8bf0b3a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8288,6 +8288,8 @@ self: super: with self; { merge3 = callPackage ../development/python-modules/merge3 { }; + mergecal = callPackage ../development/python-modules/mergecal { }; + mergedb = callPackage ../development/python-modules/mergedb { }; mergedeep = callPackage ../development/python-modules/mergedeep { }; From d06fab435bffb2db245edf1a77aba4317ef16a83 Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Mon, 20 Jan 2025 02:16:15 +0100 Subject: [PATCH 4/4] open-web-calendar: 1.42 -> 1.48 https://open-web-calendar.quelltext.eu/changelog/#v143 https://open-web-calendar.quelltext.eu/changelog/#v144 https://open-web-calendar.quelltext.eu/changelog/#v145 https://open-web-calendar.quelltext.eu/changelog/#v146 https://open-web-calendar.quelltext.eu/changelog/#v147 https://open-web-calendar.quelltext.eu/changelog/#v148 --- pkgs/by-name/op/open-web-calendar/package.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/op/open-web-calendar/package.nix b/pkgs/by-name/op/open-web-calendar/package.nix index 5e77b50f470b..0d8c0cc7cac9 100644 --- a/pkgs/by-name/op/open-web-calendar/package.nix +++ b/pkgs/by-name/op/open-web-calendar/package.nix @@ -12,7 +12,7 @@ let in python.pkgs.buildPythonApplication rec { pname = "open-web-calendar"; - version = "1.42"; + version = "1.48"; pyproject = true; disabled = python.pythonOlder "3.9"; @@ -20,7 +20,7 @@ python.pkgs.buildPythonApplication rec { src = fetchPypi { inherit version; pname = "open_web_calendar"; - hash = "sha256-w4XaT1+qIM80K6B+LIAeYdZzYIw4FYSd/nvWphOx460="; + hash = "sha256-SSe5vkrfTpUFdSLglBxo5//VZfuXYnWs5sUKJL2zWOw="; }; # The Pypi tarball doesn't contain open_web_calendars/features @@ -35,6 +35,7 @@ python.pkgs.buildPythonApplication rec { build-system = with python.pkgs; [ hatchling hatch-vcs + hatch-requirements-txt ]; dependencies = @@ -44,6 +45,10 @@ python.pkgs.buildPythonApplication rec { flask-allowed-hosts flask icalendar + icalendar-compatibility + cryptography + bcrypt + caldav requests pyyaml recurring-ical-events @@ -52,6 +57,7 @@ python.pkgs.buildPythonApplication rec { beautifulsoup4 lxml-html-clean pytz + mergecal ] ++ requests.optional-dependencies.socks;