From dd650536efe701ec2811a743d4bb8b425129efae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 3 Mar 2026 16:39:24 -0800 Subject: [PATCH 1/2] calendar-cli: 1.0.1 -> 1.0.2 Diff: https://github.com/tobixen/calendar-cli/compare/v1.0.1...v0.15.0 Changelog: https://github.com/tobixen/calendar-cli/releases/tag/v0.15.0 --- pkgs/by-name/ca/calendar-cli/package.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/calendar-cli/package.nix b/pkgs/by-name/ca/calendar-cli/package.nix index 310aa702f60c..1f40239015e3 100644 --- a/pkgs/by-name/ca/calendar-cli/package.nix +++ b/pkgs/by-name/ca/calendar-cli/package.nix @@ -11,17 +11,21 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "calendar-cli"; - version = "1.0.1"; + version = "1.0.2"; pyproject = true; src = fetchFromGitHub { owner = "tobixen"; repo = "calendar-cli"; - rev = "v${finalAttrs.version}"; - hash = "sha256-w35ySLnfxXZR/a7BrPLYqXs2kqkuYhh5PcgNxJqjDtE="; + # https://github.com/tobixen/calendar-cli/pull/113#issuecomment-3977892432 + tag = "v0.15.0"; + hash = "sha256-P6ClvX6C5VargAvudgSvBwObIUouTRg7SQ62KxhcKiE="; }; postPatch = '' + substituteInPlace calendar_cli/metadata.py \ + --replace-fail '"version": "1.0.1"' '"version": "${finalAttrs.version}"' + patchShebangs tests substituteInPlace tests/test_calendar-cli.sh \ --replace-fail "../bin/calendar-cli.py" "$out/bin/calendar-cli" \ @@ -66,6 +70,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { }; meta = { + changelog = "https://github.com/tobixen/calendar-cli/releases/tag/${finalAttrs.src.tag}"; description = "Simple command-line CalDav client"; homepage = "https://github.com/tobixen/calendar-cli"; license = lib.licenses.gpl3Plus; From c0fd49824cf01c14ab91ed20d0d37b2bc2757092 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 4 Mar 2026 11:58:47 -0800 Subject: [PATCH 2/2] calendar-cli: run versionCheckHook --- pkgs/by-name/ca/calendar-cli/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/ca/calendar-cli/package.nix b/pkgs/by-name/ca/calendar-cli/package.nix index 1f40239015e3..e160cfef0863 100644 --- a/pkgs/by-name/ca/calendar-cli/package.nix +++ b/pkgs/by-name/ca/calendar-cli/package.nix @@ -5,6 +5,7 @@ nixosTests, perl, radicale, + versionCheckHook, which, xandikos, }: @@ -51,18 +52,21 @@ python3.pkgs.buildPythonApplication (finalAttrs: { nativeCheckInputs = [ perl (python3.pkgs.toPythonModule (radicale.override { inherit python3; })) + versionCheckHook which xandikos ]; checkPhase = '' runHook preCheck + runHook preInstallCheck pushd tests ./test_calendar-cli.sh popd runHook postCheck + runHook postInstallCheck ''; passthru.tests = {