From 30bfcf1a10d8b490e23dd8a3a86cf205b4f2cdd5 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Tue, 22 Jan 2019 16:23:08 +0100
Subject: reaktor-krebs: join #nixos-de

---
 krebs/2configs/reaktor-krebs.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'krebs')

diff --git a/krebs/2configs/reaktor-krebs.nix b/krebs/2configs/reaktor-krebs.nix
index 862c9b991..67ca23ecd 100644
--- a/krebs/2configs/reaktor-krebs.nix
+++ b/krebs/2configs/reaktor-krebs.nix
@@ -7,6 +7,7 @@ with import <stockholm/lib>;
     channels = [
       "#krebs"
       "#nixos-wiki"
+      "#nixos-de"
     ];
     extraEnviron = {
       REAKTOR_HOST = "irc.freenode.org";
-- 
cgit v1.2.3


From ef6d1453c3119b3ba1f554c1e3860773e5c2e87e Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 22 Jan 2019 19:35:03 +0100
Subject: krebs: import reaktor2 service

---
 krebs/3modules/default.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'krebs')

diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix
index bb69bfad3..9303a81fb 100644
--- a/krebs/3modules/default.nix
+++ b/krebs/3modules/default.nix
@@ -42,6 +42,7 @@ let
       ./per-user.nix
       ./power-action.nix
       ./Reaktor.nix
+      ./reaktor2.nix
       ./realwallpaper.nix
       ./retiolum-bootstrap.nix
       ./retiolum-hosts.nix
-- 
cgit v1.2.3


From 659eb2e6c5a3be36044ed27a8dfdea71d3ec43c7 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Wed, 23 Jan 2019 00:04:51 +0100
Subject: reaktor2: 0.0.0 -> 0.1.0

---
 krebs/5pkgs/haskell/reaktor2.nix | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'krebs')

diff --git a/krebs/5pkgs/haskell/reaktor2.nix b/krebs/5pkgs/haskell/reaktor2.nix
index 447738425..10dc3fc49 100644
--- a/krebs/5pkgs/haskell/reaktor2.nix
+++ b/krebs/5pkgs/haskell/reaktor2.nix
@@ -1,23 +1,25 @@
 { mkDerivation, aeson, attoparsec, base, blessings, bytestring
-, containers, fetchgit, filepath, network, network-simple
-, network-simple-tls, pcre-heavy, pcre-light, process, random
-, stdenv, text, time, transformers, unix, unordered-containers
+, containers, data-default, fetchgit, filepath, lens, lens-aeson
+, network, network-simple, network-simple-tls, pcre-heavy
+, pcre-light, process, random, stdenv, text, time, transformers
+, unagi-chan, unix, unordered-containers
 }:
 mkDerivation {
   pname = "reaktor2";
-  version = "0.0.0";
+  version = "0.1.0";
   src = fetchgit {
     url = "https://cgit.krebsco.de/reaktor2";
-    sha256 = "1q2rb78mzpyd8wxfmlbfdz7zq5smsrrvb4n874ap1p8f2bmmp0am";
-    rev = "ce276eee82ec0b8c4106beb4c51d6f9eb77335c4";
+    sha256 = "0g5b40y2gbknghzw12jar1im87k0g4hjg259wf1gp5v55dh3xwk6";
+    rev = "d40815fd56bf1895af89b72b1171675a2e0ae5f7";
     fetchSubmodules = true;
   };
   isLibrary = false;
   isExecutable = true;
   executableHaskellDepends = [
-    aeson attoparsec base blessings bytestring containers filepath
-    network network-simple network-simple-tls pcre-heavy pcre-light
-    process random text time transformers unix unordered-containers
+    aeson attoparsec base blessings bytestring containers data-default
+    filepath lens lens-aeson network network-simple network-simple-tls
+    pcre-heavy pcre-light process random text time transformers
+    unagi-chan unix unordered-containers
   ];
   license = stdenv.lib.licenses.mit;
 }
-- 
cgit v1.2.3


From 31a987903f0d007a19a84d7db4c18b6641d0454a Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Wed, 23 Jan 2019 13:50:09 +0100
Subject: reaktor2: 0.1.0 -> 0.1.1

---
 krebs/5pkgs/haskell/reaktor2.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'krebs')

diff --git a/krebs/5pkgs/haskell/reaktor2.nix b/krebs/5pkgs/haskell/reaktor2.nix
index 10dc3fc49..e33cbde2c 100644
--- a/krebs/5pkgs/haskell/reaktor2.nix
+++ b/krebs/5pkgs/haskell/reaktor2.nix
@@ -1,16 +1,16 @@
 { mkDerivation, aeson, attoparsec, base, blessings, bytestring
 , containers, data-default, fetchgit, filepath, lens, lens-aeson
 , network, network-simple, network-simple-tls, pcre-heavy
-, pcre-light, process, random, stdenv, text, time, transformers
-, unagi-chan, unix, unordered-containers
+, pcre-light, process, random, stdenv, stringsearch, text, time
+, transformers, unagi-chan, unix, unordered-containers, vector
 }:
 mkDerivation {
   pname = "reaktor2";
-  version = "0.1.0";
+  version = "0.1.1";
   src = fetchgit {
     url = "https://cgit.krebsco.de/reaktor2";
-    sha256 = "0g5b40y2gbknghzw12jar1im87k0g4hjg259wf1gp5v55dh3xwk6";
-    rev = "d40815fd56bf1895af89b72b1171675a2e0ae5f7";
+    sha256 = "0d78560gj8hm02zaps63f9mby4lzz82f45i8ypwc9l3lnsypdsr3";
+    rev = "4fa5cb937c016f8c10bf8f40d017ca3a436db2d3";
     fetchSubmodules = true;
   };
   isLibrary = false;
@@ -18,8 +18,8 @@ mkDerivation {
   executableHaskellDepends = [
     aeson attoparsec base blessings bytestring containers data-default
     filepath lens lens-aeson network network-simple network-simple-tls
-    pcre-heavy pcre-light process random text time transformers
-    unagi-chan unix unordered-containers
+    pcre-heavy pcre-light process random stringsearch text time
+    transformers unagi-chan unix unordered-containers vector
   ];
   license = stdenv.lib.licenses.mit;
 }
-- 
cgit v1.2.3


From 282e4049b6b76fc19276b5ea786d7c40ed3a231f Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Wed, 23 Jan 2019 14:01:48 +0100
Subject: Reaktor scripts: chmod +x

---
 krebs/5pkgs/simple/Reaktor/scripts/random-emoji.sh  | 0
 krebs/5pkgs/simple/Reaktor/scripts/random-issue.sh  | 0
 krebs/5pkgs/simple/Reaktor/scripts/sed-plugin.py    | 0
 krebs/5pkgs/simple/Reaktor/scripts/shack-correct.sh | 0
 4 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 krebs/5pkgs/simple/Reaktor/scripts/random-emoji.sh
 mode change 100644 => 100755 krebs/5pkgs/simple/Reaktor/scripts/random-issue.sh
 mode change 100644 => 100755 krebs/5pkgs/simple/Reaktor/scripts/sed-plugin.py
 mode change 100644 => 100755 krebs/5pkgs/simple/Reaktor/scripts/shack-correct.sh

(limited to 'krebs')

diff --git a/krebs/5pkgs/simple/Reaktor/scripts/random-emoji.sh b/krebs/5pkgs/simple/Reaktor/scripts/random-emoji.sh
old mode 100644
new mode 100755
diff --git a/krebs/5pkgs/simple/Reaktor/scripts/random-issue.sh b/krebs/5pkgs/simple/Reaktor/scripts/random-issue.sh
old mode 100644
new mode 100755
diff --git a/krebs/5pkgs/simple/Reaktor/scripts/sed-plugin.py b/krebs/5pkgs/simple/Reaktor/scripts/sed-plugin.py
old mode 100644
new mode 100755
diff --git a/krebs/5pkgs/simple/Reaktor/scripts/shack-correct.sh b/krebs/5pkgs/simple/Reaktor/scripts/shack-correct.sh
old mode 100644
new mode 100755
-- 
cgit v1.2.3


From 00c529b9d5d0567d9c30e640b2ffbbc79d987c4b Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Wed, 23 Jan 2019 14:08:51 +0100
Subject: Reaktor random-emoji: curl -S

---
 krebs/5pkgs/simple/Reaktor/scripts/random-emoji.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'krebs')

diff --git a/krebs/5pkgs/simple/Reaktor/scripts/random-emoji.sh b/krebs/5pkgs/simple/Reaktor/scripts/random-emoji.sh
index 386aa68b9..6f3dd4a3f 100755
--- a/krebs/5pkgs/simple/Reaktor/scripts/random-emoji.sh
+++ b/krebs/5pkgs/simple/Reaktor/scripts/random-emoji.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-curl http://emojicons.com/random -s | \
+curl -sS http://emojicons.com/random | \
   grep data-text | \
   sed -n 's/.*>\(.*\)<\/textarea>/\1/p' | \
   head -n 1 | \
-- 
cgit v1.2.3


From f60d2867465e1aa26846cd5cce39f5f70c654e03 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 24 Jan 2019 17:23:54 +0100
Subject: reaktor2: 0.1.1 -> 0.1.2

---
 krebs/5pkgs/haskell/reaktor2.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'krebs')

diff --git a/krebs/5pkgs/haskell/reaktor2.nix b/krebs/5pkgs/haskell/reaktor2.nix
index e33cbde2c..9b02b2727 100644
--- a/krebs/5pkgs/haskell/reaktor2.nix
+++ b/krebs/5pkgs/haskell/reaktor2.nix
@@ -6,11 +6,11 @@
 }:
 mkDerivation {
   pname = "reaktor2";
-  version = "0.1.1";
+  version = "0.1.2";
   src = fetchgit {
     url = "https://cgit.krebsco.de/reaktor2";
-    sha256 = "0d78560gj8hm02zaps63f9mby4lzz82f45i8ypwc9l3lnsypdsr3";
-    rev = "4fa5cb937c016f8c10bf8f40d017ca3a436db2d3";
+    sha256 = "1198sajpkd6m87j402y796270hwifyn9wk2by6wcrxvwhq1vgs9k";
+    rev = "d5f66b27b2cd7c36eb7c2e81b0cdca10c5a5ef90";
     fetchSubmodules = true;
   };
   isLibrary = false;
-- 
cgit v1.2.3


From 2e5ed5d1bbf158a933f330119b9a5f931e192560 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 24 Jan 2019 21:16:44 +0100
Subject: reaktor2: 0.1.2 -> 0.1.3

---
 krebs/5pkgs/haskell/reaktor2.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'krebs')

diff --git a/krebs/5pkgs/haskell/reaktor2.nix b/krebs/5pkgs/haskell/reaktor2.nix
index 9b02b2727..c0c7281a6 100644
--- a/krebs/5pkgs/haskell/reaktor2.nix
+++ b/krebs/5pkgs/haskell/reaktor2.nix
@@ -6,11 +6,11 @@
 }:
 mkDerivation {
   pname = "reaktor2";
-  version = "0.1.2";
+  version = "0.1.3";
   src = fetchgit {
     url = "https://cgit.krebsco.de/reaktor2";
-    sha256 = "1198sajpkd6m87j402y796270hwifyn9wk2by6wcrxvwhq1vgs9k";
-    rev = "d5f66b27b2cd7c36eb7c2e81b0cdca10c5a5ef90";
+    sha256 = "15qhycfja7psnd7v5hn4qb5wrs6bjx4qhny49nkhb7agj4vzwnwi";
+    rev = "6c629a0cc422872abdfc40f9621ac0c4f6a420a8";
     fetchSubmodules = true;
   };
   isLibrary = false;
-- 
cgit v1.2.3


From 7c160fd1fac105402c27925a46a84cec9c12ca1a Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 25 Jan 2019 14:26:50 +0100
Subject: blessings: 1.3.0 -> 2.1.0

---
 krebs/5pkgs/haskell/blessings.nix   |  4 ++--
 krebs/5pkgs/haskell/much.nix        | 29 +++++++++++++++++++++++++++++
 krebs/5pkgs/haskell/reaktor2.nix    |  6 +++---
 krebs/5pkgs/simple/much/cabal.nix   | 28 ----------------------------
 krebs/5pkgs/simple/much/default.nix |  3 ---
 5 files changed, 34 insertions(+), 36 deletions(-)
 create mode 100644 krebs/5pkgs/haskell/much.nix
 delete mode 100644 krebs/5pkgs/simple/much/cabal.nix
 delete mode 100644 krebs/5pkgs/simple/much/default.nix

(limited to 'krebs')

diff --git a/krebs/5pkgs/haskell/blessings.nix b/krebs/5pkgs/haskell/blessings.nix
index 19f8da19d..97e4a717c 100644
--- a/krebs/5pkgs/haskell/blessings.nix
+++ b/krebs/5pkgs/haskell/blessings.nix
@@ -7,8 +7,8 @@ with import <stockholm/lib>;
       sha256 = "1k908zap3694fcxdk4bb29s54b0lhdh557y10ybjskfwnym7szn1";
     };
     "18.09" = {
-      version = "1.3.0";
-      sha256 = "1y9jhh9pchrr48zgfib2jip97x1fkm7qb1gnfx477rmmryjs500h";
+      version = "2.1.0";
+      sha256 = "0wc8v48bb0bkvypc0j6imvnf8xc8572hykk9sgjhzf2w0ggqxv5d";
     };
   }.${versions.majorMinor nixpkgsVersion};
 
diff --git a/krebs/5pkgs/haskell/much.nix b/krebs/5pkgs/haskell/much.nix
new file mode 100644
index 000000000..db168f8a1
--- /dev/null
+++ b/krebs/5pkgs/haskell/much.nix
@@ -0,0 +1,29 @@
+{ mkDerivation, aeson, attoparsec, base, base64-bytestring
+, blaze-builder, blessings, bytestring, case-insensitive
+, containers, deepseq, directory, docopt, email-header, fetchgit
+, filepath, friendly-time, hyphenation, linebreak, old-locale
+, process, random, rosezipper, safe, scanner, split, stdenv
+, terminal-size, text, time, transformers, transformers-compat
+, unix, vector
+}:
+mkDerivation {
+  pname = "much";
+  version = "1.2.0";
+  src = fetchgit {
+    url = "https://cgit.krebsco.de/much";
+    sha256 = "0gfvppi8acylz0q7xh8dkm3dj676d4sc1m1gxwp663bkn4748873";
+    rev = "8fc4fbb5bb7781626da8f63cd8df8bb0f554cfe7";
+    fetchSubmodules = true;
+  };
+  isLibrary = false;
+  isExecutable = true;
+  executableHaskellDepends = [
+    aeson attoparsec base base64-bytestring blaze-builder blessings
+    bytestring case-insensitive containers deepseq directory docopt
+    email-header filepath friendly-time hyphenation linebreak
+    old-locale process random rosezipper safe scanner split
+    terminal-size text time transformers transformers-compat unix
+    vector
+  ];
+  license = stdenv.lib.licenses.mit;
+}
diff --git a/krebs/5pkgs/haskell/reaktor2.nix b/krebs/5pkgs/haskell/reaktor2.nix
index c0c7281a6..f0835428d 100644
--- a/krebs/5pkgs/haskell/reaktor2.nix
+++ b/krebs/5pkgs/haskell/reaktor2.nix
@@ -6,11 +6,11 @@
 }:
 mkDerivation {
   pname = "reaktor2";
-  version = "0.1.3";
+  version = "0.1.4";
   src = fetchgit {
     url = "https://cgit.krebsco.de/reaktor2";
-    sha256 = "15qhycfja7psnd7v5hn4qb5wrs6bjx4qhny49nkhb7agj4vzwnwi";
-    rev = "6c629a0cc422872abdfc40f9621ac0c4f6a420a8";
+    sha256 = "1qfm3vb78r02ma8wdcfbwzmigj6skjl53nmp2z7czjcfjhm1zyq5";
+    rev = "147f818a72f4561ed57131e0d181704b599d09f6";
     fetchSubmodules = true;
   };
   isLibrary = false;
diff --git a/krebs/5pkgs/simple/much/cabal.nix b/krebs/5pkgs/simple/much/cabal.nix
deleted file mode 100644
index 09bc7b5df..000000000
--- a/krebs/5pkgs/simple/much/cabal.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ mkDerivation, aeson, attoparsec, base, base64-bytestring
-, blaze-builder, blessings, bytestring, case-insensitive
-, containers, deepseq, directory, docopt, email-header, fetchgit
-, filepath, friendly-time, hyphenation, linebreak, old-locale
-, process, random, rosezipper, safe, scanner, split, stdenv
-, terminal-size, text, time, transformers, transformers-compat
-, unix, vector
-}:
-mkDerivation {
-  pname = "much";
-  version = "1.1.0";
-  src = fetchgit {
-    url = "http://cgit.ni.krebsco.de/much";
-    sha256 = "1325554zymr1dd0clj8c5ygl70c791csvs0hz33jcfr6b8wysdrl";
-    rev = "dfec37d848e11c00d9b7f03295af1fc7b0e83ef5";
-  };
-  isLibrary = false;
-  isExecutable = true;
-  executableHaskellDepends = [
-    aeson attoparsec base base64-bytestring blaze-builder blessings
-    bytestring case-insensitive containers deepseq directory docopt
-    email-header filepath friendly-time hyphenation linebreak
-    old-locale process random rosezipper safe scanner split
-    terminal-size text time transformers transformers-compat unix
-    vector
-  ];
-  license = stdenv.lib.licenses.mit;
-}
diff --git a/krebs/5pkgs/simple/much/default.nix b/krebs/5pkgs/simple/much/default.nix
deleted file mode 100644
index cf55eb537..000000000
--- a/krebs/5pkgs/simple/much/default.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{ haskellPackages, ... }:
-
-haskellPackages.callPackage ./cabal.nix {}
-- 
cgit v1.2.3


From b3c65141b8179dddbfdcd783e14a20575be5d2e2 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 25 Jan 2019 14:54:31 +0100
Subject: reaktor2: 0.1.4 -> 0.1.5

---
 krebs/5pkgs/haskell/reaktor2.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'krebs')

diff --git a/krebs/5pkgs/haskell/reaktor2.nix b/krebs/5pkgs/haskell/reaktor2.nix
index f0835428d..6c0a3e634 100644
--- a/krebs/5pkgs/haskell/reaktor2.nix
+++ b/krebs/5pkgs/haskell/reaktor2.nix
@@ -6,11 +6,11 @@
 }:
 mkDerivation {
   pname = "reaktor2";
-  version = "0.1.4";
+  version = "0.1.5";
   src = fetchgit {
     url = "https://cgit.krebsco.de/reaktor2";
-    sha256 = "1qfm3vb78r02ma8wdcfbwzmigj6skjl53nmp2z7czjcfjhm1zyq5";
-    rev = "147f818a72f4561ed57131e0d181704b599d09f6";
+    sha256 = "1n20ms61pp0yncs0y0mx40nj80ivv9qqv4l2ya39rfp21anmwf1s";
+    rev = "f8c5b4cfe57cb50503b8333d5d06bd0f99fdecc6";
     fetchSubmodules = true;
   };
   isLibrary = false;
-- 
cgit v1.2.3


From 27bd27f150a913782203fc3de30861a2488a1cea Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sat, 26 Jan 2019 20:41:45 +0100
Subject: reaktor2: 0.1.5 -> 0.1.6

---
 krebs/5pkgs/haskell/reaktor2.nix | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

(limited to 'krebs')

diff --git a/krebs/5pkgs/haskell/reaktor2.nix b/krebs/5pkgs/haskell/reaktor2.nix
index 6c0a3e634..3369108f3 100644
--- a/krebs/5pkgs/haskell/reaktor2.nix
+++ b/krebs/5pkgs/haskell/reaktor2.nix
@@ -1,25 +1,27 @@
-{ mkDerivation, aeson, attoparsec, base, blessings, bytestring
-, containers, data-default, fetchgit, filepath, lens, lens-aeson
-, network, network-simple, network-simple-tls, pcre-heavy
-, pcre-light, process, random, stdenv, stringsearch, text, time
-, transformers, unagi-chan, unix, unordered-containers, vector
+{ mkDerivation, aeson, async, attoparsec, base, blessings
+, bytestring, containers, data-default, fetchgit, filepath, lens
+, lens-aeson, network, network-simple, network-simple-tls
+, pcre-heavy, pcre-light, process, random, stdenv, stringsearch
+, text, time, transformers, unagi-chan, unix, unordered-containers
+, vector
 }:
 mkDerivation {
   pname = "reaktor2";
-  version = "0.1.5";
+  version = "0.1.6";
   src = fetchgit {
     url = "https://cgit.krebsco.de/reaktor2";
-    sha256 = "1n20ms61pp0yncs0y0mx40nj80ivv9qqv4l2ya39rfp21anmwf1s";
-    rev = "f8c5b4cfe57cb50503b8333d5d06bd0f99fdecc6";
+    sha256 = "0fkf9g431332fbd4wd496lnbllidyrx96gzwhcjsvaz5m7yla411";
+    rev = "ed95e04bb1a5ce6ffc425647bafc7cc50f71f561";
     fetchSubmodules = true;
   };
   isLibrary = false;
   isExecutable = true;
   executableHaskellDepends = [
-    aeson attoparsec base blessings bytestring containers data-default
-    filepath lens lens-aeson network network-simple network-simple-tls
-    pcre-heavy pcre-light process random stringsearch text time
-    transformers unagi-chan unix unordered-containers vector
+    aeson async attoparsec base blessings bytestring containers
+    data-default filepath lens lens-aeson network network-simple
+    network-simple-tls pcre-heavy pcre-light process random
+    stringsearch text time transformers unagi-chan unix
+    unordered-containers vector
   ];
   license = stdenv.lib.licenses.mit;
 }
-- 
cgit v1.2.3


From 775d7a789dd9f36e37c795d3a186d9a124551295 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sat, 26 Jan 2019 21:28:35 +0100
Subject: reaktor2: 0.1.6 -> 0.1.7

---
 krebs/5pkgs/haskell/reaktor2.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'krebs')

diff --git a/krebs/5pkgs/haskell/reaktor2.nix b/krebs/5pkgs/haskell/reaktor2.nix
index 3369108f3..33ae40cd6 100644
--- a/krebs/5pkgs/haskell/reaktor2.nix
+++ b/krebs/5pkgs/haskell/reaktor2.nix
@@ -7,11 +7,11 @@
 }:
 mkDerivation {
   pname = "reaktor2";
-  version = "0.1.6";
+  version = "0.1.7";
   src = fetchgit {
     url = "https://cgit.krebsco.de/reaktor2";
-    sha256 = "0fkf9g431332fbd4wd496lnbllidyrx96gzwhcjsvaz5m7yla411";
-    rev = "ed95e04bb1a5ce6ffc425647bafc7cc50f71f561";
+    sha256 = "1ifjwn5dadlyhbdyym1i3g5vbsc7dyv7qzyprmcvx0qspr3rrk82";
+    rev = "0395a9d9815d7d82469f0064738bef80ac87dbe3";
     fetchSubmodules = true;
   };
   isLibrary = false;
-- 
cgit v1.2.3


From 2263863845ce9636aa08d06eec15ae00b83139e7 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sun, 27 Jan 2019 03:18:03 +0100
Subject: add nscd-fix

---
 krebs/2configs/nscd-fix.nix | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 krebs/2configs/nscd-fix.nix

(limited to 'krebs')

diff --git a/krebs/2configs/nscd-fix.nix b/krebs/2configs/nscd-fix.nix
new file mode 100644
index 000000000..20dc3bae4
--- /dev/null
+++ b/krebs/2configs/nscd-fix.nix
@@ -0,0 +1,24 @@
+{ pkgs, ... }:
+with import <stockholm/lib>;
+let
+  versionOlderThan = v:
+    compareVersions
+      (versions.majorMinor version)
+      (versions.majorMinor v)
+      == -1;
+
+  enable =
+    versionOlderThan "19.03";
+    warning = ''
+      Using custom services.nscd.config because
+      https://github.com/NixOS/nixpkgs/pull/50316
+    '';
+in
+  optionalAttrs enable (trace warning {
+    services.nscd.enable = mkForce true;
+    services.nscd.config = mkForce (readFile (pkgs.fetchurl {
+      url = https://raw.githubusercontent.com/arianvp/nixpkgs/1d5f4cb/nixos/modules/services/system/nscd.conf;
+      sha256 = "1jlddk38lyynjn51zx3xi1nc29ahajyh0qg48qbq6dqlsrn3wxqs";
+    }));
+  })
+
-- 
cgit v1.2.3


From a7af3289a94568ba9a092ee8d36c6719f2ddf34d Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sun, 27 Jan 2019 03:27:29 +0100
Subject: pkgs: add reaktor2-plugins

---
 krebs/5pkgs/simple/reaktor2-plugins.nix | 106 ++++++++++++++++++++++++++++++++
 1 file changed, 106 insertions(+)
 create mode 100644 krebs/5pkgs/simple/reaktor2-plugins.nix

(limited to 'krebs')

diff --git a/krebs/5pkgs/simple/reaktor2-plugins.nix b/krebs/5pkgs/simple/reaktor2-plugins.nix
new file mode 100644
index 000000000..fcbcd6365
--- /dev/null
+++ b/krebs/5pkgs/simple/reaktor2-plugins.nix
@@ -0,0 +1,106 @@
+{ lib, pkgs, ... }:
+with import <stockholm/lib>;
+
+rec {
+  generators = {
+    command_hook = commands: {
+      pattern =
+        "^\\s*([0-9A-Za-z._][0-9A-Za-z._-]*)(?:\\s+(.*\\S))?\\s*$";
+      command = 1;
+      arguments = [2];
+      commands = commands;
+    };
+  };
+
+  commands = {
+
+    hello = {
+      filename = "${pkgs.Reaktor.src}/reaktor/commands/hello";
+    };
+
+    random-emoji = {
+      filename = <stockholm/krebs/5pkgs/simple/Reaktor/scripts/random-emoji.sh>;
+      env = {
+        PATH = makeBinPath (with pkgs; [ coreutils gnused gnugrep xmlstarlet wget ]);
+      };
+    };
+
+    nixos-version = {
+      filename = pkgs.writeDash "nixos-version" ''
+        . /etc/os-release
+        echo "$PRETTY_NAME"
+      '';
+    };
+
+    stockholm-issue = {
+      filename = <stockholm/krebs/5pkgs/simple/Reaktor/scripts/random-issue.sh>;
+      env = {
+        PATH = makeBinPath (with pkgs; [ coreutils git gnused haskellPackages.lentil ]);
+        origin = "http://cgit.gum/stockholm";
+        state_dir = "/tmp/stockholm-issue";
+      };
+    };
+
+  };
+
+  hooks = {
+
+    sed = {
+      activate = "always";
+      pattern = "^(.*)$";
+      arguments = [1];
+      command = {
+        env = {
+          PATH = makeBinPath (with pkgs; [ gnused ]);
+          state_dir = "/tmp";
+        };
+        filename = pkgs.writeDash "sed-plugin" ''
+          set -efu
+          exec ${pkgs.python3}/bin/python \
+              ${<stockholm/krebs/5pkgs/simple/Reaktor/scripts/sed-plugin.py>} "$@"
+        '';
+      };
+    };
+
+    shack-correct = {
+      activate = "match";
+      pattern = "^(.*Shack.*)$";
+      arguments = [1];
+      command.filename = <stockholm/krebs/5pkgs/simple/Reaktor/scripts/shack-correct.sh>;
+    };
+
+
+    url-title = {
+      #pattern = "^.*(http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*\(\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+).*$";
+      pattern = "^.*(http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*\(\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+).*$";
+      activate = "match";
+      arguments = [1];
+      command = {
+        filename = pkgs.writePython3 "url-title" { deps = with pkgs.python3Packages; [ beautifulsoup4 lxml ]; } ''
+          import cgi
+          import sys
+          import urllib.request
+          from bs4 import BeautifulSoup
+
+          try:
+              req = urllib.request.Request(sys.argv[1])
+              req.add_header('user-agent', 'Reaktor-url-title')
+              resp = urllib.request.urlopen(req)
+              if resp.headers['content-type'].find('text/html') >= 0:
+                  soup = BeautifulSoup(resp.read(16000), "lxml")
+                  title = soup.find('title').string
+
+                  if len(title.split('\n')) > 5:
+                      title = '\n'.join(title.split('\n')[:5])
+
+                  print(title[:450])
+              else:
+                  cd_header = resp.headers['content-disposition']
+                  print(cgi.parse_header(cd_header)[1]['filename'])
+          except:  # noqa: E722
+              pass
+        '';
+      };
+    };
+  };
+}
-- 
cgit v1.2.3


From ab18e5a468980e7b7dd7ae97566675680b1b8c88 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sun, 27 Jan 2019 03:29:00 +0100
Subject: reaktor2: 0.1.7 -> 0.2.0

---
 krebs/5pkgs/haskell/reaktor2.nix | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'krebs')

diff --git a/krebs/5pkgs/haskell/reaktor2.nix b/krebs/5pkgs/haskell/reaktor2.nix
index 33ae40cd6..dd8c3578b 100644
--- a/krebs/5pkgs/haskell/reaktor2.nix
+++ b/krebs/5pkgs/haskell/reaktor2.nix
@@ -1,27 +1,27 @@
 { mkDerivation, aeson, async, attoparsec, base, blessings
-, bytestring, containers, data-default, fetchgit, filepath, lens
-, lens-aeson, network, network-simple, network-simple-tls
-, pcre-heavy, pcre-light, process, random, stdenv, stringsearch
-, text, time, transformers, unagi-chan, unix, unordered-containers
-, vector
+, bytestring, containers, data-default, fetchgit, filepath
+, hashable, lens, lens-aeson, network, network-simple
+, network-simple-tls, pcre-light, process, random, stdenv
+, string-conversions, stringsearch, text, time, transformers
+, unagi-chan, unix, unordered-containers, vector
 }:
 mkDerivation {
   pname = "reaktor2";
-  version = "0.1.7";
+  version = "0.2.0";
   src = fetchgit {
     url = "https://cgit.krebsco.de/reaktor2";
-    sha256 = "1ifjwn5dadlyhbdyym1i3g5vbsc7dyv7qzyprmcvx0qspr3rrk82";
-    rev = "0395a9d9815d7d82469f0064738bef80ac87dbe3";
+    sha256 = "1wls61d9z9zkvvfgq60clcph0800kpvymqw63dpsk0sp13zygpg9";
+    rev = "e9ca12a945b1d1c068e9c31050e264cb20690db4";
     fetchSubmodules = true;
   };
   isLibrary = false;
   isExecutable = true;
   executableHaskellDepends = [
     aeson async attoparsec base blessings bytestring containers
-    data-default filepath lens lens-aeson network network-simple
-    network-simple-tls pcre-heavy pcre-light process random
-    stringsearch text time transformers unagi-chan unix
-    unordered-containers vector
+    data-default filepath hashable lens lens-aeson network
+    network-simple network-simple-tls pcre-light process random
+    string-conversions stringsearch text time transformers unagi-chan
+    unix unordered-containers vector
   ];
   license = stdenv.lib.licenses.mit;
 }
-- 
cgit v1.2.3


From aa070d5db7e9fac66addcbf2005f4c404c84c019 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sun, 27 Jan 2019 03:33:30 +0100
Subject: hotdog.r: import nscd-fix

---
 krebs/1systems/hotdog/config.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'krebs')

diff --git a/krebs/1systems/hotdog/config.nix b/krebs/1systems/hotdog/config.nix
index cf72e0d73..2f6f76f79 100644
--- a/krebs/1systems/hotdog/config.nix
+++ b/krebs/1systems/hotdog/config.nix
@@ -14,6 +14,7 @@
     <stockholm/krebs/2configs/ircd.nix>
     <stockholm/krebs/2configs/reaktor-retiolum.nix>
     <stockholm/krebs/2configs/reaktor-krebs.nix>
+    <stockholm/krebs/2configs/nscd-fix.nix>
     <stockholm/krebs/2configs/repo-sync.nix>
   ];
 
-- 
cgit v1.2.3


From 6271cfaed465ca826534494951b450713773c1a4 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sun, 27 Jan 2019 13:41:51 +0100
Subject: reaktor2: add user option

---
 krebs/3modules/reaktor2.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'krebs')

diff --git a/krebs/3modules/reaktor2.nix b/krebs/3modules/reaktor2.nix
index b667bcc92..d31447c93 100644
--- a/krebs/3modules/reaktor2.nix
+++ b/krebs/3modules/reaktor2.nix
@@ -25,7 +25,7 @@ with import <stockholm/lib>;
           type = types.listOf types.attrs;
         };
         stateDir = mkOption {
-          default = "/var/lib/${self.config.systemd-service-name}";
+          default = "/var/lib/${self.config.user}";
           readOnly = true;
           type = types.absolute-pathname;
         };
@@ -33,6 +33,10 @@ with import <stockholm/lib>;
           default = "reaktor2${optionalString (name != "default") "-${name}"}";
           type = types.filename;
         };
+        user = mkOption {
+          default = self.config.systemd-service-name;
+          type = types.str;
+        };
       };
     }));
   };
@@ -43,10 +47,10 @@ with import <stockholm/lib>;
         after = [ "network.target" ];
         wantedBy = [ "multi-user.target" ];
         serviceConfig = {
-          User = cfg.systemd-service-name;
+          User = cfg.user;
           Group = "reaktor2";
           DynamicUser = true;
-          StateDirectory = cfg.systemd-service-name;
+          StateDirectory = cfg.user;
           ExecStart = let
             configFile = pkgs.writeJSON configFileName configValue;
             configFileName = "${cfg.systemd-service-name}.config.json";
-- 
cgit v1.2.3


From b28706964e78199859cbf6b78f869e9cc2f8a8ac Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sun, 27 Jan 2019 03:34:47 +0100
Subject: hotdog.r: Reaktor -> reaktor2

---
 krebs/1systems/hotdog/config.nix    |   3 +-
 krebs/2configs/reaktor-krebs.nix    |  27 ------
 krebs/2configs/reaktor-retiolum.nix |  17 ----
 krebs/2configs/reaktor2.nix         | 181 ++++++++++++++++++++++++++++++++++++
 4 files changed, 182 insertions(+), 46 deletions(-)
 delete mode 100644 krebs/2configs/reaktor-krebs.nix
 delete mode 100644 krebs/2configs/reaktor-retiolum.nix
 create mode 100644 krebs/2configs/reaktor2.nix

(limited to 'krebs')

diff --git a/krebs/1systems/hotdog/config.nix b/krebs/1systems/hotdog/config.nix
index 2f6f76f79..916073375 100644
--- a/krebs/1systems/hotdog/config.nix
+++ b/krebs/1systems/hotdog/config.nix
@@ -12,9 +12,8 @@
     <stockholm/krebs/2configs/buildbot-stockholm.nix>
     <stockholm/krebs/2configs/binary-cache/nixos.nix>
     <stockholm/krebs/2configs/ircd.nix>
-    <stockholm/krebs/2configs/reaktor-retiolum.nix>
-    <stockholm/krebs/2configs/reaktor-krebs.nix>
     <stockholm/krebs/2configs/nscd-fix.nix>
+    <stockholm/krebs/2configs/reaktor2.nix>
     <stockholm/krebs/2configs/repo-sync.nix>
   ];
 
diff --git a/krebs/2configs/reaktor-krebs.nix b/krebs/2configs/reaktor-krebs.nix
deleted file mode 100644
index 67ca23ecd..000000000
--- a/krebs/2configs/reaktor-krebs.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ config, lib, pkgs, ... }:
-with import <stockholm/lib>;
-
-{
-  krebs.Reaktor.krebs = {
-    nickname = "Reaktor|krebs";
-    channels = [
-      "#krebs"
-      "#nixos-wiki"
-      "#nixos-de"
-    ];
-    extraEnviron = {
-      REAKTOR_HOST = "irc.freenode.org";
-      REAKTOR_NICKSERV_PASSWORD = "/var/lib/Reaktor/reaktor_nickserv_password";
-    };
-    plugins = with pkgs.ReaktorPlugins; [
-      sed-plugin
-    ] ++
-      (attrValues (task "agenda"))
-    ;
-  };
-  krebs.secret.files.nix-serve-key = {
-    path = "/var/lib/Reaktor/reaktor_nickserv_password";
-    owner.name = "Reaktor";
-    source-path = toString <secrets> + "/reaktor_nickserv_password";
-  };
-}
diff --git a/krebs/2configs/reaktor-retiolum.nix b/krebs/2configs/reaktor-retiolum.nix
deleted file mode 100644
index 69fc4b202..000000000
--- a/krebs/2configs/reaktor-retiolum.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ config, lib, pkgs, ... }:
-with import <stockholm/lib>;
-
-{
-  krebs.Reaktor.retiolum = {
-    nickname = "Reaktor|lass";
-    channels = [ "#noise" "#xxx" ];
-    extraEnviron = {
-      REAKTOR_HOST = "irc.r";
-    };
-    plugins = with pkgs.ReaktorPlugins; [
-      sed-plugin
-    ] ++
-      (attrValues (task "agenda"))
-    ;
-  };
-}
diff --git a/krebs/2configs/reaktor2.nix b/krebs/2configs/reaktor2.nix
new file mode 100644
index 000000000..95a95b8f5
--- /dev/null
+++ b/krebs/2configs/reaktor2.nix
@@ -0,0 +1,181 @@
+with import <stockholm/lib>;
+{ config, pkgs, ... }:
+
+let
+  stateDir = config.krebs.reaktor2.r.stateDir;
+
+  generators = pkgs.reaktor2-plugins.generators;
+  hooks = pkgs.reaktor2-plugins.hooks;
+  commands = pkgs.reaktor2-plugins.commands;
+
+  task = name: let
+    rcFile = builtins.toFile "taskrc" ''
+      confirmation=no
+    '';
+  in {
+    "${name}-task-add" = {
+      pattern = "^${name}-add: (.*)$";
+      activate = "match";
+      arguments = [1];
+      command = {
+        env = {
+          TASKDATA = "${stateDir}/${name}";
+        };
+        filename = pkgs.writeDash "${name}-task-add" ''
+          ${pkgs.taskwarrior}/bin/task rc:${rcFile} add "$*"
+        '';
+      };
+    };
+
+    "${name}-task-list" = {
+      pattern = "^${name}-list$";
+      activate = "match";
+      command = {
+        env = {
+          TASKDATA = "${stateDir}/${name}";
+        };
+        filename = pkgs.writeDash "${name}-task-list" ''
+          ${pkgs.taskwarrior}/bin/task rc:${rcFile} export | ${pkgs.jq}/bin/jq -r '.[] | select(.id != 0) | "\(.id) \(.description)"'
+        '';
+      };
+    };
+
+    "${name}-task-delete" = {
+      pattern = "^${name}-delete: (.*)$";
+      activate = "match";
+      arguments = [1];
+      command = {
+        env = {
+          TASKDATA = "${stateDir}/${name}";
+        };
+        filename = pkgs.writeDash "${name}-task-delete" ''
+          ${pkgs.taskwarrior}/bin/task rc:${rcFile} delete "$*"
+        '';
+      };
+    };
+
+    "${name}-task-done" = {
+      pattern = "^${name}-done: (.*)$";
+      activate = "match";
+      arguments = [1];
+      command = {
+        env = {
+          TASKDATA = "${stateDir}/${name}";
+        };
+        filename = pkgs.writeDash "${name}-task-done" ''
+          ${pkgs.taskwarrior}/bin/task rc:${rcFile} done "$*"
+        '';
+      };
+    };
+  };
+
+  systemPlugin = {
+    plugin = "system";
+    config = {
+      workdir = stateDir;
+      hooks.JOIN = [
+        {
+          activate = "always";
+          command = {
+            filename =
+              "${pkgs.Reaktor.src}/reaktor/commands/tell-on_join";
+            env = {
+              PATH = makeBinPath [
+                pkgs.coreutils # XXX env, touch
+                pkgs.jq # XXX sed
+                pkgs.utillinux # XXX flock
+              ];
+              state_file = "${stateDir}/tell.json";
+            };
+          };
+        }
+      ];
+      hooks.PRIVMSG = [
+        {
+          pattern = "^ledger balance";
+          activate = "match";
+          command = {
+            env = {
+              state_file = "${stateDir}/ledger";
+            };
+            filename = pkgs.writeDash "ledger-balance" ''
+              ${pkgs.hledger}/bin/hledger -f $state_file bal -N
+            '';
+          };
+        }
+        {
+          pattern = ''^(\S+)\s+([+-][1-9][0-9]*)\s+(\S+)$'';
+          activate = "match";
+          arguments = [1 2 3];
+          command = {
+            env = {
+              # TODO; get state as argument
+              state_file = "${stateDir}/ledger";
+            };
+            filename = pkgs.writeDash "ledger-add" ''
+              set -x
+              tonick=$1
+              amt=$2
+              unit=$3
+              printf '%s\n  %s  %d %s\n  %s  %d %s\n' "$(date -Id)" "$tonick" "$amt" "$unit" "$_from" "$(expr 0 - "''${amt#+}")" "$unit" >> $state_file
+            '';
+          };
+        }
+        hooks.sed
+        (generators.command_hook {
+          inherit (commands) hello random-emoji nixos-version stockholm-issue;
+          tell = {
+            filename =
+              "${pkgs.Reaktor.src}/reaktor/commands/tell-on_privmsg";
+            env = {
+              PATH = makeBinPath [
+                pkgs.coreutils # XXX date, env
+                pkgs.jq # XXX sed
+                pkgs.utillinux # XXX flock
+              ];
+              state_file = "${stateDir}/tell.txt";
+            };
+          };
+        })
+      ] ++ (attrValues (task "agenda"))
+      ;
+    };
+  };
+
+in {
+
+  krebs.reaktor2 = {
+    freenode = {
+      hostname = "irc.freenode.org";
+      nick = "reaktor2|krebs";
+      plugins = [
+        {
+          plugin = "register";
+          config = {
+            channels = [
+              "#krebs"
+            ];
+          };
+        }
+        systemPlugin
+      ];
+      user = "reaktor2";
+    };
+    r = {
+      nick = "reaktor2|krebs";
+      plugins = [
+        {
+          plugin = "register";
+          config = {
+            channels = [
+              "#noise"
+              "#xxx"
+            ];
+          };
+        }
+        systemPlugin
+      ];
+      user = "reaktor2";
+    };
+  };
+}
-- 
cgit v1.2.3


From 052cef71fd24ce36bbd043e2aa12d2ff3a9d247c Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sun, 27 Jan 2019 13:50:31 +0100
Subject: reaktor: ledger balance -> bier balance

---
 krebs/2configs/reaktor2.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'krebs')

diff --git a/krebs/2configs/reaktor2.nix b/krebs/2configs/reaktor2.nix
index 95a95b8f5..ae2e975a2 100644
--- a/krebs/2configs/reaktor2.nix
+++ b/krebs/2configs/reaktor2.nix
@@ -92,13 +92,13 @@ let
       ];
       hooks.PRIVMSG = [
         {
-          pattern = "^ledger balance";
+          pattern = "^bier balance";
           activate = "match";
           command = {
             env = {
               state_file = "${stateDir}/ledger";
             };
-            filename = pkgs.writeDash "ledger-balance" ''
+            filename = pkgs.writeDash "bier-balance" ''
               ${pkgs.hledger}/bin/hledger -f $state_file bal -N
             '';
           };
-- 
cgit v1.2.3


From fd4876da16d436a38700b358f26ba48903de8d20 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sun, 27 Jan 2019 14:27:54 +0100
Subject: reaktor2: pretty print bier balance

---
 krebs/2configs/reaktor2.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'krebs')

diff --git a/krebs/2configs/reaktor2.nix b/krebs/2configs/reaktor2.nix
index ae2e975a2..bdd95a256 100644
--- a/krebs/2configs/reaktor2.nix
+++ b/krebs/2configs/reaktor2.nix
@@ -99,7 +99,9 @@ let
               state_file = "${stateDir}/ledger";
             };
             filename = pkgs.writeDash "bier-balance" ''
-              ${pkgs.hledger}/bin/hledger -f $state_file bal -N
+              ${pkgs.hledger}/bin/hledger -f $state_file bal -N -O csv \
+                | ${pkgs.coreutils}/bin/tail +2 \
+                | ${pkgs.miller}/bin/mlr --icsv --opprint cat
             '';
           };
         }
-- 
cgit v1.2.3


From 92caf2dadae82310fe13830dfaac30fe885fbf3e Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sun, 27 Jan 2019 14:32:33 +0100
Subject: reaktor2 bier: allow 'bier bal' as command

---
 krebs/2configs/reaktor2.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'krebs')

diff --git a/krebs/2configs/reaktor2.nix b/krebs/2configs/reaktor2.nix
index bdd95a256..9ca60b5bf 100644
--- a/krebs/2configs/reaktor2.nix
+++ b/krebs/2configs/reaktor2.nix
@@ -92,7 +92,7 @@ let
       ];
       hooks.PRIVMSG = [
         {
-          pattern = "^bier balance";
+          pattern = "^bier bal(ance)*$";
           activate = "match";
           command = {
             env = {
-- 
cgit v1.2.3


From 5926a718593544c69301f4168d30051ff1d61aab Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sun, 27 Jan 2019 16:55:47 +0100
Subject: reaktor2 task: use single hook for more efficency

---
 krebs/2configs/reaktor2.nix | 39 ++++++++++++---------------------------
 1 file changed, 12 insertions(+), 27 deletions(-)

(limited to 'krebs')

diff --git a/krebs/2configs/reaktor2.nix b/krebs/2configs/reaktor2.nix
index 9ca60b5bf..f1e59142e 100644
--- a/krebs/2configs/reaktor2.nix
+++ b/krebs/2configs/reaktor2.nix
@@ -2,6 +2,7 @@ with import <stockholm/lib>;
 { config, pkgs, ... }:
 
 let
+  #for shared state directory
   stateDir = config.krebs.reaktor2.r.stateDir;
 
   generators = pkgs.reaktor2-plugins.generators;
@@ -13,11 +14,12 @@ let
       confirmation=no
     '';
   in {
-    "${name}-task-add" = {
-      pattern = "^${name}-add: (.*)$";
-      activate = "match";
-      arguments = [1];
-      command = {
+    pattern = "^${name}-([a-z]+)(?::\\s*(.*))?";
+    activate = "match";
+    command = 1;
+    arguments = [2];
+    commands = {
+      add = {
         env = {
           TASKDATA = "${stateDir}/${name}";
         };
@@ -25,12 +27,7 @@ let
           ${pkgs.taskwarrior}/bin/task rc:${rcFile} add "$*"
         '';
       };
-    };
-
-    "${name}-task-list" = {
-      pattern = "^${name}-list$";
-      activate = "match";
-      command = {
+      list = {
         env = {
           TASKDATA = "${stateDir}/${name}";
         };
@@ -38,13 +35,7 @@ let
           ${pkgs.taskwarrior}/bin/task rc:${rcFile} export | ${pkgs.jq}/bin/jq -r '.[] | select(.id != 0) | "\(.id) \(.description)"'
         '';
       };
-    };
-
-    "${name}-task-delete" = {
-      pattern = "^${name}-delete: (.*)$";
-      activate = "match";
-      arguments = [1];
-      command = {
+      delete = {
         env = {
           TASKDATA = "${stateDir}/${name}";
         };
@@ -52,13 +43,7 @@ let
           ${pkgs.taskwarrior}/bin/task rc:${rcFile} delete "$*"
         '';
       };
-    };
-
-    "${name}-task-done" = {
-      pattern = "^${name}-done: (.*)$";
-      activate = "match";
-      arguments = [1];
-      command = {
+      done = {
         env = {
           TASKDATA = "${stateDir}/${name}";
         };
@@ -139,8 +124,8 @@ let
             };
           };
         })
-      ] ++ (attrValues (task "agenda"))
-      ;
+        (task "agenda")
+      ];
     };
   };
 
-- 
cgit v1.2.3


From 6965a1df8e7fe5e85128349c31057fdc8c8d54f6 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sun, 27 Jan 2019 18:33:22 +0100
Subject: reaktor2 service: add useTLS option

---
 krebs/3modules/reaktor2.nix | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'krebs')

diff --git a/krebs/3modules/reaktor2.nix b/krebs/3modules/reaktor2.nix
index b667bcc92..3dd86503f 100644
--- a/krebs/3modules/reaktor2.nix
+++ b/krebs/3modules/reaktor2.nix
@@ -33,6 +33,10 @@ with import <stockholm/lib>;
           default = "reaktor2${optionalString (name != "default") "-${name}"}";
           type = types.filename;
         };
+        useTLS = mkOption {
+          default = self.config.port == "6697";
+          type = types.bool;
+        };
       };
     }));
   };
-- 
cgit v1.2.3


From fa1e5d5b7fa2424e636d5807141c3043770affaf Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sun, 27 Jan 2019 19:33:43 +0100
Subject: l reaktor-plugins: use correct header

---
 krebs/5pkgs/simple/reaktor2-plugins.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'krebs')

diff --git a/krebs/5pkgs/simple/reaktor2-plugins.nix b/krebs/5pkgs/simple/reaktor2-plugins.nix
index fcbcd6365..48464c0b6 100644
--- a/krebs/5pkgs/simple/reaktor2-plugins.nix
+++ b/krebs/5pkgs/simple/reaktor2-plugins.nix
@@ -1,5 +1,5 @@
-{ lib, pkgs, ... }:
 with import <stockholm/lib>;
+{ lib, pkgs, ... }:
 
 rec {
   generators = {
-- 
cgit v1.2.3


From 52ef20148e44f2b2017a0edc30899860799ad652 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sun, 27 Jan 2019 20:06:06 +0100
Subject: reaktor2 service: user -> username + proper type

---
 krebs/2configs/reaktor2.nix |  4 ++--
 krebs/3modules/reaktor2.nix | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'krebs')

diff --git a/krebs/2configs/reaktor2.nix b/krebs/2configs/reaktor2.nix
index f1e59142e..2beb6561b 100644
--- a/krebs/2configs/reaktor2.nix
+++ b/krebs/2configs/reaktor2.nix
@@ -146,7 +146,7 @@ in {
         }
         systemPlugin
       ];
-      user = "reaktor2";
+      username = "reaktor2";
     };
     r = {
       nick = "reaktor2|krebs";
@@ -162,7 +162,7 @@ in {
         }
         systemPlugin
       ];
-      user = "reaktor2";
+      username = "reaktor2";
     };
   };
 }
diff --git a/krebs/3modules/reaktor2.nix b/krebs/3modules/reaktor2.nix
index 3f263d010..e3e6ddf4f 100644
--- a/krebs/3modules/reaktor2.nix
+++ b/krebs/3modules/reaktor2.nix
@@ -25,7 +25,7 @@ with import <stockholm/lib>;
           type = types.listOf types.attrs;
         };
         stateDir = mkOption {
-          default = "/var/lib/${self.config.user}";
+          default = "/var/lib/${self.config.username}";
           readOnly = true;
           type = types.absolute-pathname;
         };
@@ -33,9 +33,9 @@ with import <stockholm/lib>;
           default = "reaktor2${optionalString (name != "default") "-${name}"}";
           type = types.filename;
         };
-        user = mkOption {
+        username = mkOption {
           default = self.config.systemd-service-name;
-          type = types.str;
+          type = types.username;
         };
         useTLS = mkOption {
           default = self.config.port == "6697";
@@ -51,10 +51,10 @@ with import <stockholm/lib>;
         after = [ "network.target" ];
         wantedBy = [ "multi-user.target" ];
         serviceConfig = {
-          User = cfg.user;
+          User = cfg.username;
           Group = "reaktor2";
           DynamicUser = true;
-          StateDirectory = cfg.user;
+          StateDirectory = cfg.username;
           ExecStart = let
             configFile = pkgs.writeJSON configFileName configValue;
             configFileName = "${cfg.systemd-service-name}.config.json";
-- 
cgit v1.2.3


From b4f24ff76ad708343b67afce45765a66c6bfb660 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sun, 27 Jan 2019 20:09:11 +0100
Subject: krebs nscd-fix: normalize style

---
 krebs/2configs/nscd-fix.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'krebs')

diff --git a/krebs/2configs/nscd-fix.nix b/krebs/2configs/nscd-fix.nix
index 20dc3bae4..8e5909e72 100644
--- a/krebs/2configs/nscd-fix.nix
+++ b/krebs/2configs/nscd-fix.nix
@@ -1,18 +1,19 @@
-{ pkgs, ... }:
 with import <stockholm/lib>;
-let
+{ pkgs, ... }: let
+
+  enable = versionOlderThan "19.03";
+
   versionOlderThan = v:
     compareVersions
       (versions.majorMinor version)
       (versions.majorMinor v)
       == -1;
 
-  enable =
-    versionOlderThan "19.03";
-    warning = ''
-      Using custom services.nscd.config because
-      https://github.com/NixOS/nixpkgs/pull/50316
-    '';
+  warning = ''
+    Using custom services.nscd.config because
+    https://github.com/NixOS/nixpkgs/pull/50316
+  '';
+
 in
   optionalAttrs enable (trace warning {
     services.nscd.enable = mkForce true;
@@ -21,4 +22,3 @@ in
       sha256 = "1jlddk38lyynjn51zx3xi1nc29ahajyh0qg48qbq6dqlsrn3wxqs";
     }));
   })
-
-- 
cgit v1.2.3


From 74dbc7c8b21a345626659cbbcc6bf11836939945 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sun, 27 Jan 2019 20:15:40 +0100
Subject: Reaktor: 0.6.2 -> 0.7.0

---
 krebs/3modules/Reaktor.nix             | 5 +++--
 krebs/5pkgs/simple/Reaktor/default.nix | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'krebs')

diff --git a/krebs/3modules/Reaktor.nix b/krebs/3modules/Reaktor.nix
index 669483f3c..308c6d41d 100644
--- a/krebs/3modules/Reaktor.nix
+++ b/krebs/3modules/Reaktor.nix
@@ -113,10 +113,11 @@ let
         '';
       in nameValuePair "Reaktor-${name}" {
         path = with pkgs; [
-          utillinux #flock for tell_on-join
           git # for nag
+          jq # for tell
           python # for caps
-          ];
+          utillinux # flock for tell
+        ];
         description = "Reaktor IRC Bot";
         after = [ "network.target" ];
         wantedBy = [ "multi-user.target" ];
diff --git a/krebs/5pkgs/simple/Reaktor/default.nix b/krebs/5pkgs/simple/Reaktor/default.nix
index 3ef9ffb7d..a88db6379 100644
--- a/krebs/5pkgs/simple/Reaktor/default.nix
+++ b/krebs/5pkgs/simple/Reaktor/default.nix
@@ -2,7 +2,7 @@
 
 python3Packages.buildPythonPackage rec {
   name = "Reaktor-${version}";
-  version = "0.6.2";
+  version = "0.7.0";
 
   doCheck = false;
 
@@ -13,8 +13,8 @@ python3Packages.buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "krebs";
     repo = "Reaktor";
-    rev = version;
-    sha256 = "0h8pj0x9b5fnxddwrc0f63rxd3275v5phmjc0fv4kiwlzvbcxj6m";
+    rev = "v${version}";
+    sha256 = "12yy06vk0smjs0rmahrn2kd4bcdh1yjw1fz6rifw6nmgx889d9hj";
   };
   meta = {
     homepage = http://krebsco.de/;
-- 
cgit v1.2.3


From f608351da19aeae5fd06dd700a8f11150433d15e Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sun, 27 Jan 2019 20:27:16 +0100
Subject: reaktor2: 0.2.0 -> 0.2.1

---
 krebs/5pkgs/haskell/reaktor2.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'krebs')

diff --git a/krebs/5pkgs/haskell/reaktor2.nix b/krebs/5pkgs/haskell/reaktor2.nix
index dd8c3578b..40c628802 100644
--- a/krebs/5pkgs/haskell/reaktor2.nix
+++ b/krebs/5pkgs/haskell/reaktor2.nix
@@ -7,11 +7,11 @@
 }:
 mkDerivation {
   pname = "reaktor2";
-  version = "0.2.0";
+  version = "0.2.1";
   src = fetchgit {
     url = "https://cgit.krebsco.de/reaktor2";
-    sha256 = "1wls61d9z9zkvvfgq60clcph0800kpvymqw63dpsk0sp13zygpg9";
-    rev = "e9ca12a945b1d1c068e9c31050e264cb20690db4";
+    sha256 = "0wg76wlzfi893rl0lzhfs6bkpdcvwvgl6mpnz6w7r8f7znr4a9vr";
+    rev = "0e199f7a357a4c5973e5837ec67699cf224ca69c";
     fetchSubmodules = true;
   };
   isLibrary = false;
-- 
cgit v1.2.3


From 06b23af29d434f448faebf822d5f1f1e8a0c0a39 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sun, 27 Jan 2019 20:32:04 +0100
Subject: reaktor2 task: define env in hook

---
 krebs/2configs/reaktor2.nix | 48 +++++++++++++++------------------------------
 1 file changed, 16 insertions(+), 32 deletions(-)

(limited to 'krebs')

diff --git a/krebs/2configs/reaktor2.nix b/krebs/2configs/reaktor2.nix
index 2beb6561b..ff6b539ba 100644
--- a/krebs/2configs/reaktor2.nix
+++ b/krebs/2configs/reaktor2.nix
@@ -18,39 +18,23 @@ let
     activate = "match";
     command = 1;
     arguments = [2];
+    env.TASKDATA = "${stateDir}/${name}";
     commands = {
-      add = {
-        env = {
-          TASKDATA = "${stateDir}/${name}";
-        };
-        filename = pkgs.writeDash "${name}-task-add" ''
-          ${pkgs.taskwarrior}/bin/task rc:${rcFile} add "$*"
-        '';
-      };
-      list = {
-        env = {
-          TASKDATA = "${stateDir}/${name}";
-        };
-        filename = pkgs.writeDash "${name}-task-list" ''
-          ${pkgs.taskwarrior}/bin/task rc:${rcFile} export | ${pkgs.jq}/bin/jq -r '.[] | select(.id != 0) | "\(.id) \(.description)"'
-        '';
-      };
-      delete = {
-        env = {
-          TASKDATA = "${stateDir}/${name}";
-        };
-        filename = pkgs.writeDash "${name}-task-delete" ''
-          ${pkgs.taskwarrior}/bin/task rc:${rcFile} delete "$*"
-        '';
-      };
-      done = {
-        env = {
-          TASKDATA = "${stateDir}/${name}";
-        };
-        filename = pkgs.writeDash "${name}-task-done" ''
-          ${pkgs.taskwarrior}/bin/task rc:${rcFile} done "$*"
-        '';
-      };
+      add.filename = pkgs.writeDash "${name}-task-add" ''
+        ${pkgs.taskwarrior}/bin/task rc:${rcFile} add "$1"
+      '';
+      list.filename = pkgs.writeDash "${name}-task-list" ''
+        ${pkgs.taskwarrior}/bin/task rc:${rcFile} export \
+          | ${pkgs.jq}/bin/jq -r '
+              .[] | select(.id != 0) | "\(.id) \(.description)"
+            '
+      '';
+      delete.filename = pkgs.writeDash "${name}-task-delete" ''
+        ${pkgs.taskwarrior}/bin/task rc:${rcFile} delete "$1"
+      '';
+      done.filename = pkgs.writeDash "${name}-task-done" ''
+        ${pkgs.taskwarrior}/bin/task rc:${rcFile} done "$1"
+      '';
     };
   };
 
-- 
cgit v1.2.3