From 5d35353424f0eac994bc7320f0da2d4d7cf0b2c8 Mon Sep 17 00:00:00 2001 From: Fernando Rodrigues Date: Fri, 27 Dec 2024 08:23:24 -0300 Subject: [PATCH 1/3] taskwarrior3: use the correct tag for version 3.3.0 Signed-off-by: Fernando Rodrigues --- pkgs/by-name/ta/taskwarrior3/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ta/taskwarrior3/package.nix b/pkgs/by-name/ta/taskwarrior3/package.nix index e9b1c4959185..5690226ff894 100644 --- a/pkgs/by-name/ta/taskwarrior3/package.nix +++ b/pkgs/by-name/ta/taskwarrior3/package.nix @@ -26,8 +26,8 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "GothenburgBitFactory"; repo = "taskwarrior"; - rev = "dcbe916286792e6f5d2d3af3baab79918ebc5f71"; - hash = "sha256-jma1BYZugMH+JiX5Xu6VI8ZFn4FBr1NxbNrOHX0bFk0="; + rev = "v${finalAttrs.version}"; + hash = "sha256-aKDwRCJ1yopRdsPxnHhgOpSho1i8/dcAurI+XhpSbn4="; fetchSubmodules = true; }; cargoDeps = rustPlatform.fetchCargoTarball { From c7cadfffda24853b99d5c1056a51cdf75d7978bc Mon Sep 17 00:00:00 2001 From: Fernando Rodrigues Date: Fri, 27 Dec 2024 08:23:24 -0300 Subject: [PATCH 2/3] taskwarrior3: use versionCheckHook to prevent future commit/version mismatches. Signed-off-by: Fernando Rodrigues --- pkgs/by-name/ta/taskwarrior3/package.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/by-name/ta/taskwarrior3/package.nix b/pkgs/by-name/ta/taskwarrior3/package.nix index 5690226ff894..4aa1d000bd5a 100644 --- a/pkgs/by-name/ta/taskwarrior3/package.nix +++ b/pkgs/by-name/ta/taskwarrior3/package.nix @@ -19,6 +19,9 @@ # nativeCheckInputs python3, + + # nativeInstallCheckInputs + versionCheckHook, }: stdenv.mkDerivation (finalAttrs: { pname = "taskwarrior"; @@ -90,6 +93,14 @@ stdenv.mkDerivation (finalAttrs: { python3 ]; + doInstallCheck = true; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + + versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}"; + postInstall = '' # ZSH is installed automatically from some reason, only bash and fish need # manual installation From c5f91fe86cc1e73f72e25b740b24ae53ed279741 Mon Sep 17 00:00:00 2001 From: Fernando Rodrigues Date: Fri, 27 Dec 2024 08:34:24 -0300 Subject: [PATCH 3/3] taskwarrior3: use GitHub releases as changelogs Upstream links to the releases instead of the changelog file: https://taskwarrior.org/news/news.20241219/ Signed-off-by: Fernando Rodrigues --- pkgs/by-name/ta/taskwarrior3/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ta/taskwarrior3/package.nix b/pkgs/by-name/ta/taskwarrior3/package.nix index 4aa1d000bd5a..277c54025681 100644 --- a/pkgs/by-name/ta/taskwarrior3/package.nix +++ b/pkgs/by-name/ta/taskwarrior3/package.nix @@ -119,7 +119,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.tests.nixos = nixosTests.taskchampion-sync-server; meta = { - changelog = "https://github.com/GothenburgBitFactory/taskwarrior/blob/${finalAttrs.src.rev}/ChangeLog"; + changelog = "https://github.com/GothenburgBitFactory/taskwarrior/releases/tag/v${finalAttrs.src.rev}"; description = "Highly flexible command-line tool to manage TODO lists"; homepage = "https://taskwarrior.org"; license = lib.licenses.mit;