diff --git a/pkgs/by-name/ca/calendar-cli/package.nix b/pkgs/by-name/ca/calendar-cli/package.nix index 310aa702f60c..e160cfef0863 100644 --- a/pkgs/by-name/ca/calendar-cli/package.nix +++ b/pkgs/by-name/ca/calendar-cli/package.nix @@ -5,23 +5,28 @@ nixosTests, perl, radicale, + versionCheckHook, which, xandikos, }: 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" \ @@ -47,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 = { @@ -66,6 +74,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; diff --git a/pkgs/development/python-modules/pysyncthru/default.nix b/pkgs/development/python-modules/pysyncthru/default.nix index b00019514c36..40d1bca3432f 100644 --- a/pkgs/development/python-modules/pysyncthru/default.nix +++ b/pkgs/development/python-modules/pysyncthru/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pysyncthru"; - version = "0.8.0"; + version = "0.10.1"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "nielstron"; repo = "pysyncthru"; tag = version; - hash = "sha256-Zije1WzfgIU9pT0H7T/Mx+5gEBCsRgMLkfsa/KB0YtI="; + hash = "sha256-IJfj65p80Q4LwWkGV0A0QPtK2+FPkNVz9/WaNGzgTy8="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/web/nodejs/v22.nix b/pkgs/development/web/nodejs/v22.nix index 046d655161f8..1dd6c16bbe36 100644 --- a/pkgs/development/web/nodejs/v22.nix +++ b/pkgs/development/web/nodejs/v22.nix @@ -21,8 +21,8 @@ let [ ]; in buildNodejs { - version = "22.22.0"; - sha256 = "4c138012bb5352f49822a8f3e6d1db71e00639d0c36d5b6756f91e4c6f30b683"; + version = "22.22.1"; + sha256 = "87104b07e7acee748bcc5391e1bc69cf3571caa0fdfb8b1d6b5fd3f9599b7849"; patches = ( if (stdenv.hostPlatform.emulatorAvailable buildPackages) then