From a48cf7052a176376ec1bfe8da78f0491f6324aa4 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 15 Aug 2017 23:20:58 +0200
Subject: populate: 1.2.2 -> 1.2.3

---
 krebs/5pkgs/simple/populate/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'krebs/5pkgs/simple')

diff --git a/krebs/5pkgs/simple/populate/default.nix b/krebs/5pkgs/simple/populate/default.nix
index 48afee037..1ed268cf0 100644
--- a/krebs/5pkgs/simple/populate/default.nix
+++ b/krebs/5pkgs/simple/populate/default.nix
@@ -13,12 +13,12 @@ in
 
 stdenv.mkDerivation rec {
   name = "populate";
-  version = "1.2.2";
+  version = "1.2.3";
 
   src = fetchgit {
     url = http://cgit.ni.krebsco.de/populate;
     rev = "refs/tags/v${version}";
-    sha256 = "041rpyhss6kby3jm14k7lhvagmg7hwvwxli06b00p76s110is40w";
+    sha256 = "14p9v28d5vcr5384qgycmgjh1angi2zx7qvi51651i7nd9qkjzmi";
   };
 
   phases = [
-- 
cgit v1.2.3


From aaeacc6471d5b120c205d1710d89993fa475e266 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Wed, 30 Aug 2017 17:54:11 +0200
Subject: dic: 1.0.2 -> 1.1.0

---
 krebs/5pkgs/simple/dic/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'krebs/5pkgs/simple')

diff --git a/krebs/5pkgs/simple/dic/default.nix b/krebs/5pkgs/simple/dic/default.nix
index ffd1092f7..6533a1b9b 100644
--- a/krebs/5pkgs/simple/dic/default.nix
+++ b/krebs/5pkgs/simple/dic/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchgit, coreutils, curl, gnused, gnugrep, ... }:
+{ coreutils, curl, fetchgit, gnugrep, gnused, stdenv, utillinux }:
 
 stdenv.mkDerivation {
   name = "dic";
 
   src = fetchgit {
     url = http://cgit.ni.krebsco.de/dic;
-    rev = "refs/tags/v1.0.2";
-    sha256 = "133x2z3dr5synckdvgnyc9fa7jdca43vj0973v148i13x4dqgr36";
+    rev = "refs/tags/v1.1.0";
+    sha256 = "1xzn20b9kfz96nvjli8grpi11v80jbl0dmifksmirwcj5v81ndav";
   };
 
   phases = [
@@ -21,6 +21,7 @@ stdenv.mkDerivation {
         curl
         gnused
         gnugrep
+        utillinux
       ];
     in
     ''
-- 
cgit v1.2.3


From 1234efe72de6912f0a728eaac6c64979a729c973 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Fri, 1 Sep 2017 21:32:36 +0200
Subject: Reaktor plugins: add wiki-todo

---
 krebs/5pkgs/simple/Reaktor/plugins.nix | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'krebs/5pkgs/simple')

diff --git a/krebs/5pkgs/simple/Reaktor/plugins.nix b/krebs/5pkgs/simple/Reaktor/plugins.nix
index e85e41cfe..d4fa5b1cf 100644
--- a/krebs/5pkgs/simple/Reaktor/plugins.nix
+++ b/krebs/5pkgs/simple/Reaktor/plugins.nix
@@ -128,4 +128,23 @@ rec {
     '';
   });
 
+  wiki-todo-add = buildSimpleReaktorPlugin "wiki-todo-add" {
+    pattern = "^wiki-todo: (?P<args>.*)$$";
+    script = pkgs.writeDash "wiki-todo-add" ''
+      echo "$@" >> wiki-todo
+      echo "added todo"
+    '';
+  };
+  wiki-todo-done = buildSimpleReaktorPlugin "wiki-todo-done" {
+    pattern = "^wiki-todo-done: (?P<args>.*)$$";
+    script = pkgs.writeDash "wiki-todo-done" ''
+      ${pkgs.gnugrep}/bin/grep -vFx "$@" wiki-todo > wiki-todo.tmp
+      ${pkgs.coreutils}/bin/mv wiki-todo.tmp wiki-todo
+    '';
+  };
+  wiki-todo-show = buildSimpleReaktorPlugin "wiki-todo" {
+    script = pkgs.writeDash "wiki-todo-add" ''
+      ${pkgs.coreutils}/bin/cat wiki-todo
+    '';
+  };
 }
-- 
cgit v1.2.3


From 877edfa122837c3025ac9fc74895be5cb92d3433 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Fri, 1 Sep 2017 22:15:51 +0200
Subject: Reaktor plugins wiki-todo: fix flag injection

found by makefu
---
 krebs/5pkgs/simple/Reaktor/plugins.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'krebs/5pkgs/simple')

diff --git a/krebs/5pkgs/simple/Reaktor/plugins.nix b/krebs/5pkgs/simple/Reaktor/plugins.nix
index d4fa5b1cf..eb591b274 100644
--- a/krebs/5pkgs/simple/Reaktor/plugins.nix
+++ b/krebs/5pkgs/simple/Reaktor/plugins.nix
@@ -131,14 +131,14 @@ rec {
   wiki-todo-add = buildSimpleReaktorPlugin "wiki-todo-add" {
     pattern = "^wiki-todo: (?P<args>.*)$$";
     script = pkgs.writeDash "wiki-todo-add" ''
-      echo "$@" >> wiki-todo
+      echo "$*" >> wiki-todo
       echo "added todo"
     '';
   };
   wiki-todo-done = buildSimpleReaktorPlugin "wiki-todo-done" {
     pattern = "^wiki-todo-done: (?P<args>.*)$$";
     script = pkgs.writeDash "wiki-todo-done" ''
-      ${pkgs.gnugrep}/bin/grep -vFx "$@" wiki-todo > wiki-todo.tmp
+      ${pkgs.gnugrep}/bin/grep -Fvxe "$*" wiki-todo > wiki-todo.tmp
       ${pkgs.coreutils}/bin/mv wiki-todo.tmp wiki-todo
     '';
   };
-- 
cgit v1.2.3


From 6ed86f26f4b65c27205d9c36adcbe9018dab7eb1 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sun, 3 Sep 2017 10:35:05 +0200
Subject: Reaktor plugins wiki-todo: update feedback text

---
 krebs/5pkgs/simple/Reaktor/plugins.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'krebs/5pkgs/simple')

diff --git a/krebs/5pkgs/simple/Reaktor/plugins.nix b/krebs/5pkgs/simple/Reaktor/plugins.nix
index eb591b274..c611d7471 100644
--- a/krebs/5pkgs/simple/Reaktor/plugins.nix
+++ b/krebs/5pkgs/simple/Reaktor/plugins.nix
@@ -132,14 +132,15 @@ rec {
     pattern = "^wiki-todo: (?P<args>.*)$$";
     script = pkgs.writeDash "wiki-todo-add" ''
       echo "$*" >> wiki-todo
-      echo "added todo"
+      echo "added todo. check on http://lassul.us/wiki-todo"
     '';
   };
   wiki-todo-done = buildSimpleReaktorPlugin "wiki-todo-done" {
-    pattern = "^wiki-todo-done: (?P<args>.*)$$";
+    pattern = "^wiki-done: (?P<args>.*)$$";
     script = pkgs.writeDash "wiki-todo-done" ''
       ${pkgs.gnugrep}/bin/grep -Fvxe "$*" wiki-todo > wiki-todo.tmp
       ${pkgs.coreutils}/bin/mv wiki-todo.tmp wiki-todo
+      echo "thank you for resolving todo: $*"
     '';
   };
   wiki-todo-show = buildSimpleReaktorPlugin "wiki-todo" {
-- 
cgit v1.2.3