From 47c3b7d5359cb1877c310d676dfd3e98300b7a45 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Mon, 7 Dec 2020 12:04:23 +0100 Subject: [PATCH] taskwarrior: 2.5.1 -> 2.5.2 (#106156) --- ...etion-quote-pattern-argument-to-grep.patch | 28 ------------------- .../applications/misc/taskwarrior/default.nix | 15 +++++----- 2 files changed, 8 insertions(+), 35 deletions(-) delete mode 100644 pkgs/applications/misc/taskwarrior/0001-bash-completion-quote-pattern-argument-to-grep.patch diff --git a/pkgs/applications/misc/taskwarrior/0001-bash-completion-quote-pattern-argument-to-grep.patch b/pkgs/applications/misc/taskwarrior/0001-bash-completion-quote-pattern-argument-to-grep.patch deleted file mode 100644 index 8e5c0139e55..00000000000 --- a/pkgs/applications/misc/taskwarrior/0001-bash-completion-quote-pattern-argument-to-grep.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 0d677475b710b9bb61d4b3ac5435c36b47d3a155 Mon Sep 17 00:00:00 2001 -From: Peter Simons -Date: Wed, 8 Feb 2017 11:28:42 +0100 -Subject: [PATCH] bash-completion: quote pattern argument to grep - -Without the quotes, bash might expand that pattern based on the contents of the -current working directory or -- if nullglob is set -- the argument disappears -outright if no directory entry matches. ---- - scripts/bash/task.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/scripts/bash/task.sh b/scripts/bash/task.sh -index e0c7fb03..d15ed3eb 100644 ---- a/scripts/bash/task.sh -+++ b/scripts/bash/task.sh -@@ -72,7 +72,7 @@ _task_offer_contexts() { - COMPREPLY=( $(compgen -W "$($taskcommand _context) define delete list none show" -- $cur) ) - } - --_task_context_alias=$($taskcommand show | grep alias.*context | cut -d' ' -f1 | cut -d. -f2) -+_task_context_alias=$($taskcommand show | grep "alias.*context" | cut -d' ' -f1 | cut -d. -f2) - - _task() - { --- -2.11.1 - diff --git a/pkgs/applications/misc/taskwarrior/default.nix b/pkgs/applications/misc/taskwarrior/default.nix index 67f2fd8927b..e18b8d697fd 100644 --- a/pkgs/applications/misc/taskwarrior/default.nix +++ b/pkgs/applications/misc/taskwarrior/default.nix @@ -1,16 +1,17 @@ -{ stdenv, fetchurl, cmake, libuuid, gnutls }: +{ stdenv, fetchFromGitHub, cmake, libuuid, gnutls }: stdenv.mkDerivation rec { pname = "taskwarrior"; - version = "2.5.1"; + version = "2.5.2"; - src = fetchurl { - url = "https://taskwarrior.org/download/task-${version}.tar.gz"; - sha256 = "059a9yc58wcicc6xxsjh1ph7k2yrag0spsahp1wqmsq6h7jwwyyq"; + src = fetchFromGitHub { + owner = "GothenburgBitFactory"; + repo = "taskwarrior"; + rev = "v${version}"; + sha256 = "0jv5b56v75qhdqbrfsddfwizmbizcsv3mn8gp92nckwlx9hrk5id"; + fetchSubmodules = true; }; - patches = [ ./0001-bash-completion-quote-pattern-argument-to-grep.patch ]; - nativeBuildInputs = [ cmake libuuid gnutls ]; postInstall = ''