diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2017-02-09 08:42:04 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2017-02-09 08:42:04 +0100 |
commit | 6bea415b5e3f4ab70afcea4c646ad76d9c073c89 (patch) | |
tree | 8f5e976cd8aecc6029b4019e16f0177e0a66a093 /pkgs/applications/misc/taskwarrior | |
parent | b846a53d2a3cba3002a4d6fb064f579677eac52c (diff) | |
parent | 4bf9f8afc39e9d0c0629635652804b81fe3e3332 (diff) | |
download | nixlib-6bea415b5e3f4ab70afcea4c646ad76d9c073c89.tar nixlib-6bea415b5e3f4ab70afcea4c646ad76d9c073c89.tar.gz nixlib-6bea415b5e3f4ab70afcea4c646ad76d9c073c89.tar.bz2 nixlib-6bea415b5e3f4ab70afcea4c646ad76d9c073c89.tar.lz nixlib-6bea415b5e3f4ab70afcea4c646ad76d9c073c89.tar.xz nixlib-6bea415b5e3f4ab70afcea4c646ad76d9c073c89.tar.zst nixlib-6bea415b5e3f4ab70afcea4c646ad76d9c073c89.zip |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/applications/misc/taskwarrior')
-rw-r--r-- | pkgs/applications/misc/taskwarrior/0001-bash-completion-quote-pattern-argument-to-grep.patch | 28 | ||||
-rw-r--r-- | pkgs/applications/misc/taskwarrior/default.nix | 4 |
2 files changed, 31 insertions, 1 deletions
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 new file mode 100644 index 000000000000..8e5c0139e555 --- /dev/null +++ b/pkgs/applications/misc/taskwarrior/0001-bash-completion-quote-pattern-argument-to-grep.patch @@ -0,0 +1,28 @@ +From 0d677475b710b9bb61d4b3ac5435c36b47d3a155 Mon Sep 17 00:00:00 2001 +From: Peter Simons <simons@cryp.to> +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 eea7ffdcaf23..e4938b928dab 100644 --- a/pkgs/applications/misc/taskwarrior/default.nix +++ b/pkgs/applications/misc/taskwarrior/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "059a9yc58wcicc6xxsjh1ph7k2yrag0spsahp1wqmsq6h7jwwyyq"; }; + patches = [ ./0001-bash-completion-quote-pattern-argument-to-grep.patch ]; + nativeBuildInputs = [ cmake libuuid gnutls ]; postInstall = '' @@ -19,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "GTD (getting things done) implementation"; + description = "Highly flexible command-line tool to manage TODO lists"; homepage = http://taskwarrior.org; license = licenses.mit; maintainers = with maintainers; [ marcweber jgeerds ]; |