From 95f3c546f6f75fb1fffbbda0caa5e37b57d33d89 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 13 Mar 2025 14:46:33 +0200 Subject: [PATCH 1/3] taskwarrior3: use tag argument in fetchFromGitHub --- 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 7567d205173a..523a5831985d 100644 --- a/pkgs/by-name/ta/taskwarrior3/package.nix +++ b/pkgs/by-name/ta/taskwarrior3/package.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "GothenburgBitFactory"; repo = "taskwarrior"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-aKDwRCJ1yopRdsPxnHhgOpSho1i8/dcAurI+XhpSbn4="; fetchSubmodules = true; }; From 7ed62dc87b8f156e4109607c9fe9194972fcd684 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 13 Mar 2025 14:46:47 +0200 Subject: [PATCH 2/3] taskwarrior3: fix meta.changelog link --- 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 523a5831985d..93fad2e8faf4 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/releases/tag/v${finalAttrs.src.rev}"; + changelog = "https://github.com/GothenburgBitFactory/taskwarrior/releases/tag/${finalAttrs.src.tag}"; description = "Highly flexible command-line tool to manage TODO lists"; homepage = "https://taskwarrior.org"; license = lib.licenses.mit; From 888d06d67d6f52c56c31445e89bbd0ed14abad43 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 13 Mar 2025 14:36:17 +0200 Subject: [PATCH 3/3] taskwarrior3: 3.3.0 -> 3.4.1 Diff: https://github.com/GothenburgBitFactory/taskwarrior/compare/v3.3.0...v3.4.1 Changelog: https://github.com/GothenburgBitFactory/taskwarrior/releases/tag/v3.4.1 --- pkgs/by-name/ta/taskwarrior3/package.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/ta/taskwarrior3/package.nix b/pkgs/by-name/ta/taskwarrior3/package.nix index 93fad2e8faf4..b9265b199a65 100644 --- a/pkgs/by-name/ta/taskwarrior3/package.nix +++ b/pkgs/by-name/ta/taskwarrior3/package.nix @@ -12,7 +12,6 @@ # buildInputs libuuid, - xdg-utils, # passthru.tests nixosTests, @@ -25,24 +24,20 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "taskwarrior"; - version = "3.3.0"; + version = "3.4.1"; src = fetchFromGitHub { owner = "GothenburgBitFactory"; repo = "taskwarrior"; tag = "v${finalAttrs.version}"; - hash = "sha256-aKDwRCJ1yopRdsPxnHhgOpSho1i8/dcAurI+XhpSbn4="; + hash = "sha256-00HiGju4pIswx8Z+M+ATdBSupiMS2xIm2ZnE52k/RwA="; fetchSubmodules = true; }; cargoDeps = rustPlatform.fetchCargoVendor { name = "${finalAttrs.pname}-${finalAttrs.version}-cargo-deps"; inherit (finalAttrs) src; - hash = "sha256-UbJodQBCrmXbw5+ahusBnEcoCYGFHRA6bg5hf9/prmA="; + hash = "sha256-trc5DIWf68XRBSMjeG/ZchuwFA56wJnLbqm17gE+jYQ="; }; - postPatch = '' - substituteInPlace src/commands/CmdNews.cpp \ - --replace-fail "xdg-open" "${lib.getBin xdg-utils}/bin/xdg-open" - ''; # The CMakeLists files used by upstream issue a `cargo install` command to # install a rust tool (cxxbridge-cmd) that is supposed to be included in the Cargo.toml's and # `Cargo.lock` files of upstream. Setting CARGO_HOME like that helps `cargo