summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2019-01-23 16:55:51 +0100
committerlassulus <lassulus@lassul.us>2019-01-23 16:55:51 +0100
commit0cc3dd577dfe7cbb7d230c3c3effa0f8b93c0e7e (patch)
tree68d7632b15f47b4dbc096159a8c4fadf3592e312
parent61a646790612dec0b7df7390df73ddfb662b0225 (diff)
parent00c529b9d5d0567d9c30e640b2ffbbc79d987c4b (diff)
Merge remote-tracking branch 'ni/master'
-rw-r--r--krebs/5pkgs/haskell/reaktor2.nix20
-rwxr-xr-x[-rw-r--r--]krebs/5pkgs/simple/Reaktor/scripts/random-emoji.sh2
-rwxr-xr-x[-rw-r--r--]krebs/5pkgs/simple/Reaktor/scripts/random-issue.sh0
-rwxr-xr-x[-rw-r--r--]krebs/5pkgs/simple/Reaktor/scripts/sed-plugin.py0
-rwxr-xr-x[-rw-r--r--]krebs/5pkgs/simple/Reaktor/scripts/shack-correct.sh0
5 files changed, 12 insertions, 10 deletions
diff --git a/krebs/5pkgs/haskell/reaktor2.nix b/krebs/5pkgs/haskell/reaktor2.nix
index 447738425..e33cbde2c 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, stringsearch, text, time
+, transformers, unagi-chan, unix, unordered-containers, vector
}:
mkDerivation {
pname = "reaktor2";
- version = "0.0.0";
+ version = "0.1.1";
src = fetchgit {
url = "https://cgit.krebsco.de/reaktor2";
- sha256 = "1q2rb78mzpyd8wxfmlbfdz7zq5smsrrvb4n874ap1p8f2bmmp0am";
- rev = "ce276eee82ec0b8c4106beb4c51d6f9eb77335c4";
+ sha256 = "0d78560gj8hm02zaps63f9mby4lzz82f45i8ypwc9l3lnsypdsr3";
+ rev = "4fa5cb937c016f8c10bf8f40d017ca3a436db2d3";
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 stringsearch text time
+ transformers unagi-chan unix unordered-containers vector
];
license = stdenv.lib.licenses.mit;
}
diff --git a/krebs/5pkgs/simple/Reaktor/scripts/random-emoji.sh b/krebs/5pkgs/simple/Reaktor/scripts/random-emoji.sh
index 386aa68b9..6f3dd4a3f 100644..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 | \
diff --git a/krebs/5pkgs/simple/Reaktor/scripts/random-issue.sh b/krebs/5pkgs/simple/Reaktor/scripts/random-issue.sh
index 5c47c6156..5c47c6156 100644..100755
--- a/krebs/5pkgs/simple/Reaktor/scripts/random-issue.sh
+++ b/krebs/5pkgs/simple/Reaktor/scripts/random-issue.sh
diff --git a/krebs/5pkgs/simple/Reaktor/scripts/sed-plugin.py b/krebs/5pkgs/simple/Reaktor/scripts/sed-plugin.py
index ecb03917b..ecb03917b 100644..100755
--- a/krebs/5pkgs/simple/Reaktor/scripts/sed-plugin.py
+++ b/krebs/5pkgs/simple/Reaktor/scripts/sed-plugin.py
diff --git a/krebs/5pkgs/simple/Reaktor/scripts/shack-correct.sh b/krebs/5pkgs/simple/Reaktor/scripts/shack-correct.sh
index d500b3cb3..d500b3cb3 100644..100755
--- a/krebs/5pkgs/simple/Reaktor/scripts/shack-correct.sh
+++ b/krebs/5pkgs/simple/Reaktor/scripts/shack-correct.sh