summaryrefslogtreecommitdiffstats
path: root/krebs/5pkgs
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2017-09-04 09:05:06 +0200
committermakefu <github@syntax-fehler.de>2017-09-04 09:05:06 +0200
commit729549d15464e57e41fd143450c36274cedc84fa (patch)
treec28cfa3576c601f7f665cebc7721ef3a08311792 /krebs/5pkgs
parent848acb85ccecbe25987bf6da45a96fc4eaaa74e9 (diff)
parentfcf59a00e2ab675cb171cbe4f21b8df73836d144 (diff)
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'krebs/5pkgs')
-rw-r--r--krebs/5pkgs/simple/Reaktor/plugins.nix20
-rw-r--r--krebs/5pkgs/simple/dic/default.nix7
-rw-r--r--krebs/5pkgs/simple/populate/default.nix4
3 files changed, 26 insertions, 5 deletions
diff --git a/krebs/5pkgs/simple/Reaktor/plugins.nix b/krebs/5pkgs/simple/Reaktor/plugins.nix
index e85e41cfe..c611d7471 100644
--- a/krebs/5pkgs/simple/Reaktor/plugins.nix
+++ b/krebs/5pkgs/simple/Reaktor/plugins.nix
@@ -128,4 +128,24 @@ 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. check on http://lassul.us/wiki-todo"
+ '';
+ };
+ wiki-todo-done = buildSimpleReaktorPlugin "wiki-todo-done" {
+ 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" {
+ script = pkgs.writeDash "wiki-todo-add" ''
+ ${pkgs.coreutils}/bin/cat wiki-todo
+ '';
+ };
}
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
''
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 = [