diff options
| author | Robert Schütz <nix@dotlambda.de> | 2024-04-22 01:48:51 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-22 01:48:51 +0000 |
| commit | 926d688d045f6174124e0ad97592510a734d833f (patch) | |
| tree | 93dcfcea643bfde1e75848e94a0753dd4c0c5c53 | |
| parent | 21b17f0be33b4b87e5e404bf24731a64a04cc510 (diff) | |
| parent | 451eb7835dbd42461098070c97d020692c36060f (diff) | |
Merge pull request #300556 from dotlambda/python3Packages.recurring-ical-events
python312Packages.recurring-ical-events: 2.1.3 -> 2.2.0
| -rw-r--r-- | nixos/tests/radicale.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/python-modules/recurring-ical-events/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/tools/networking/calendar-cli/default.nix | 8 |
3 files changed, 12 insertions, 6 deletions
diff --git a/nixos/tests/radicale.nix b/nixos/tests/radicale.nix index 66650dce4a008..868b28085a675 100644 --- a/nixos/tests/radicale.nix +++ b/nixos/tests/radicale.nix @@ -6,7 +6,7 @@ let port = "5232"; filesystem_folder = "/data/radicale"; - cli = "${pkgs.calendar-cli}/bin/calendar-cli --caldav-user ${user} --caldav-pass ${password}"; + cli = "${lib.getExe pkgs.calendar-cli} --caldav-user ${user} --caldav-pass ${password}"; in { name = "radicale3"; meta.maintainers = with lib.maintainers; [ dotlambda ]; diff --git a/pkgs/development/python-modules/recurring-ical-events/default.nix b/pkgs/development/python-modules/recurring-ical-events/default.nix index b4f5df6e42da0..fd5cdb62dd7c5 100644 --- a/pkgs/development/python-modules/recurring-ical-events/default.nix +++ b/pkgs/development/python-modules/recurring-ical-events/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "recurring-ical-events"; - version = "2.1.3"; + version = "2.2.0"; disabled = pythonOlder "3.7"; @@ -25,14 +25,14 @@ buildPythonPackage rec { owner = "niccokunzmann"; repo = "python-recurring-ical-events"; rev = "v${version}"; - hash = "sha256-K2pflwHpzuYDMNUB7YQu6NX21O0aOwRChBgjdiwFQ+Y="; + hash = "sha256-Njd+sc35jlA96iVf2uuVN2BK92ctwUDfBAUfpgqtPs0="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ icalendar pytz python-dateutil diff --git a/pkgs/tools/networking/calendar-cli/default.nix b/pkgs/tools/networking/calendar-cli/default.nix index 45b3afbf895e2..7cac9f4ae0f32 100644 --- a/pkgs/tools/networking/calendar-cli/default.nix +++ b/pkgs/tools/networking/calendar-cli/default.nix @@ -7,6 +7,7 @@ python3.pkgs.buildPythonApplication rec { pname = "calendar-cli"; version = "1.0.1"; + pyproject = true; src = fetchFromGitHub { owner = "tobixen"; @@ -15,7 +16,11 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-w35ySLnfxXZR/a7BrPLYqXs2kqkuYhh5PcgNxJqjDtE="; }; - propagatedBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ + setuptools + ]; + + dependencies = with python3.pkgs; [ icalendar caldav pytz @@ -36,6 +41,7 @@ python3.pkgs.buildPythonApplication rec { description = "Simple command-line CalDav client"; homepage = "https://github.com/tobixen/calendar-cli"; license = licenses.gpl3Plus; + mainProgram = "calendar-cli"; maintainers = with maintainers; [ dotlambda ]; }; } |