Merge remote-tracking branch 'origin/staging/jeschli'

2 files changed, 24 insertions, 12 deletions

diff --git a/krebs/5pkgs/simple/Reaktor/plugins.nix b/krebs/5pkgs/simple/Reaktor/plugins.nix
index c303f9fb3..c6e601475 100644
--- a/krebs/5pkgs/simple/Reaktor/plugins.nix
+++ b/krebs/5pkgs/simple/Reaktor/plugins.nix
@@ -146,16 +146,28 @@ rec {
     '';
   });
 
-  taskwarrior = buildSimpleReaktorPlugin "task" {
-    pattern = "^task: (?P<args>.*)$$";
-    script = let
-      taskrc = "$HOME/.taskrc";
-    in
-      pkgs.writeDash "task-wrapper" ''
-        if [ -f ${taskrc} ] ; then
-          touch ${taskrc}
-        fi
-        ${pkgs.taskwarrior}/bin/task "$*"
+  taskrcFile = builtins.toFile "taskrc" ''
+    confirmation=no
+  '';
+
+  task-add = buildSimpleReaktorPlugin "task-add" {
+    pattern = "^task-add: (?P<args>.*)$$";
+    script = pkgs.writeDash "task-add" ''
+        ${pkgs.taskwarrior}/bin/task rc:${taskrcFile} add "$*"
+      '';
+  };
+
+  task-list = buildSimpleReaktorPlugin "task-list" {
+    pattern = "^task-list";
+    script = pkgs.writeDash "task-list" ''
+        ${pkgs.taskwarrior}/bin/task rc:${taskrcFile} list
+      '';
+  };
+
+  task-delete = buildSimpleReaktorPlugin "task-delete" {
+    pattern = "^task-delete: (?P<args>.*)$$";
+    script = pkgs.writeDash "task-delete" ''
+        ${pkgs.taskwarrior}/bin/task rc:${taskrcFile} delete "$*"
       '';
   };
 
diff --git a/krebs/5pkgs/simple/krops.nix b/krebs/5pkgs/simple/krops.nix
index 29bfb52f5..e4e9928d4 100644
--- a/krebs/5pkgs/simple/krops.nix
+++ b/krebs/5pkgs/simple/krops.nix
@@ -2,6 +2,6 @@
 
 fetchgit {
   url = https://cgit.krebsco.de/krops;
-  rev = "refs/tags/v1.0.0";
-  sha256 = "0ahp3fxb3l1vcjylxw0cd0f4hfp98bxskkf3z9d37hl3m7v4pcb4";
+  rev = "refs/tags/v1.1.0";
+  sha256 = "19z5385rdci2bj0l7ksjbgyj84vsb29kz87j9x6vj5vv16y7y4ll";
 }