7 files changed, 89 insertions, 49 deletions
diff --git a/krebs/5pkgs/haskell/brockman/default.nix b/krebs/5pkgs/haskell/brockman/default.nix
new file mode 100644
index 00000000..92051a02
--- /dev/null
+++ b/krebs/5pkgs/haskell/brockman/default.nix
@@ -0,0 +1,26 @@
+{ mkDerivation, aeson, aeson-pretty, base, bytestring
+, case-insensitive, conduit, containers, directory, feed, filepath
+, hashable, hslogger, html-entity, http-client, irc-conduit, lens
+, lrucache, lrucaching, network, optparse-applicative, random, safe
+, stdenv, text, time, timerep, wreq
+, fetchFromGitHub
+}:
+mkDerivation rec {
+  pname = "brockman";
+  version = "3.4.0";
+  src = fetchFromGitHub {
+    owner = "kmein";
+    repo = "brockman";
+    rev = version;
+    sha256 = "02nval6a9xcddj6znzxvcb8g6klzjydj1lb4ych64i9mr4a8jvic";
+  };
+  isLibrary = false;
+  isExecutable = true;
+  executableHaskellDepends = [
+    aeson aeson-pretty base bytestring case-insensitive conduit
+    containers directory feed filepath hashable hslogger html-entity
+    http-client irc-conduit lens lrucache lrucaching network
+    optparse-applicative random safe text time timerep wreq
+  ];
+  license = stdenv.lib.licenses.mit;
+}
diff --git a/krebs/5pkgs/haskell/email-header.nix b/krebs/5pkgs/haskell/email-header.nix
index 572a8029..94b33e28 100644
--- a/krebs/5pkgs/haskell/email-header.nix
+++ b/krebs/5pkgs/haskell/email-header.nix
@@ -10,10 +10,15 @@ with import <stockholm/lib>;
       rev = "7b179bd31192ead8afe7a0b6e34bcad4039deaa8";
       sha256 = "12j2n3sbvzjnw99gga7kkdygm8n3qx2lh8q26ad6a53xm5whnz59";
     };
+    "20.03" = {
+      version = "0.4.1-tv1";
+      rev = "refs/tags/v${cfg.version}";
+      sha256 = "11xjivpj495r2ss9aqljnpzzycb57cm4sr7yzmf939rzwsd3ib0x";
+    };
   }.${versions.majorMinor version} or {
-    version = "0.4.1-tv1";
+    version = "0.4.1-tv2";
     rev = "refs/tags/v${cfg.version}";
-    sha256 = "11xjivpj495r2ss9aqljnpzzycb57cm4sr7yzmf939rzwsd3ib0x";
+    sha256 = "1yg4b5318lpviwgjs4kdcqg8cwfnxxfcdckcjq12r2nnj2k4ms2d";
   };
 
 in mkDerivation {
diff --git a/krebs/5pkgs/haskell/flameshot-once.nix b/krebs/5pkgs/haskell/flameshot-once.nix
index 5b369362..1b54f7db 100644
--- a/krebs/5pkgs/haskell/flameshot-once.nix
+++ b/krebs/5pkgs/haskell/flameshot-once.nix
@@ -4,11 +4,11 @@
 }:
 mkDerivation {
   pname = "flameshot-once";
-  version = "1.2.0";
+  version = "1.3.0";
   src = fetchgit {
     url = "https://cgit.krebsco.de/flameshot-once";
-    sha256 = "01c11dk8ss37awfn9xqsgx668dcrf4kvzfxlq7ycnqsnpbjjvm0a";
-    rev = "cebaefa37095e74ad2253c4e2f9d9ab390f88737";
+    sha256 = "1jy73379srnkq79i7k3al406r0kb3pxwgg6f64i89jhzxjn7zmzl";
+    rev = "81ce6b9bb68c2739ec5bda067fcfaeab931d55dd";
     fetchSubmodules = true;
   };
   isLibrary = false;
diff --git a/krebs/5pkgs/haskell/much.nix b/krebs/5pkgs/haskell/much.nix
index db168f8a..0a5453c0 100644
--- a/krebs/5pkgs/haskell/much.nix
+++ b/krebs/5pkgs/haskell/much.nix
@@ -1,29 +1,36 @@
 { 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
+, containers, data-default, deepseq, directory, either
+, email-header, fetchgit, filepath, friendly-time, http-types
+, hyphenation, linebreak, network, old-locale, optparse-applicative
+, process, random, rosezipper, safe, scanner, servant-server, split
+, stdenv, terminal-size, text, time, transformers
+, transformers-compat, unix, vector, wai, warp
 }:
 mkDerivation {
   pname = "much";
   version = "1.2.0";
   src = fetchgit {
     url = "https://cgit.krebsco.de/much";
-    sha256 = "0gfvppi8acylz0q7xh8dkm3dj676d4sc1m1gxwp663bkn4748873";
-    rev = "8fc4fbb5bb7781626da8f63cd8df8bb0f554cfe7";
+    sha256 = "0rf27d7gki5hgivy49xi59ld0j6jw3v7nxi4w1gx6byj1xsarwwl";
+    rev = "29749366052a8f6c05b314f1ff17201717855ad7";
     fetchSubmodules = true;
   };
-  isLibrary = false;
+  isLibrary = true;
   isExecutable = true;
-  executableHaskellDepends = [
+  libraryHaskellDepends = [
     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
+    bytestring case-insensitive containers data-default deepseq
+    directory either email-header filepath friendly-time http-types
+    hyphenation linebreak network old-locale optparse-applicative
+    process random rosezipper safe scanner servant-server split
     terminal-size text time transformers transformers-compat unix
-    vector
+    vector wai warp
+  ];
+  executableHaskellDepends = [
+    aeson base blessings bytestring case-insensitive containers
+    data-default deepseq directory filepath hyphenation linebreak
+    process rosezipper safe scanner text time transformers unix
   ];
   license = stdenv.lib.licenses.mit;
 }
diff --git a/krebs/5pkgs/haskell/reaktor2.nix b/krebs/5pkgs/haskell/reaktor2.nix
deleted file mode 100644
index f06e7912..00000000
--- a/krebs/5pkgs/haskell/reaktor2.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ mkDerivation, aeson, async, attoparsec, base, blessings
-, 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.2.2";
-  src = fetchgit {
-    url = "https://cgit.krebsco.de/reaktor2";
-    sha256 = "1kyr5i5zdzvc7fcyac1i1yvi88kcxafrgp8p79c1b9l4g9sjnv78";
-    rev = "9f4e2644188f985d7cd806c13e2c0dee1688b9f0";
-    fetchSubmodules = true;
-  };
-  isLibrary = false;
-  isExecutable = true;
-  executableHaskellDepends = [
-    aeson async attoparsec base blessings bytestring containers
-    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;
-}
diff --git a/krebs/5pkgs/haskell/reaktor2/default.nix b/krebs/5pkgs/haskell/reaktor2/default.nix
new file mode 100644
index 00000000..6a48f865
--- /dev/null
+++ b/krebs/5pkgs/haskell/reaktor2/default.nix
@@ -0,0 +1,28 @@
+{ mkDerivation, aeson, async, attoparsec, base, blessings
+, bytestring, containers, data-default, fetchgit, filepath
+, hashable, lens, lens-aeson, network, network-simple
+, network-simple-tls, network-uri, pcre-light, process, random
+, servant-server, stdenv, string-conversions, stringsearch, text
+, time, transformers, unagi-chan, unix, unordered-containers
+, vector, wai, warp
+}:
+mkDerivation rec {
+  pname = "reaktor2";
+  version = "0.4.0";
+  src = fetchgit {
+    url = "https://cgit.krebsco.de/reaktor2";
+    sha256 = "0bnn23hjl57y0a5rf3h8kq078dziby7il7fandz5wh6s4i3psicp";
+    rev = "v${version}";
+    fetchSubmodules = true;
+  };
+  isLibrary = false;
+  isExecutable = true;
+  executableHaskellDepends = [
+    aeson async attoparsec base blessings bytestring containers
+    data-default filepath hashable lens lens-aeson network
+    network-simple network-simple-tls network-uri pcre-light process
+    random servant-server string-conversions stringsearch text time
+    transformers unagi-chan unix unordered-containers vector wai warp
+  ];
+  license = stdenv.lib.licenses.mit;
+}
diff --git a/krebs/5pkgs/haskell/scanner.nix b/krebs/5pkgs/haskell/scanner.nix
index 071fd757..28f89b06 100644
--- a/krebs/5pkgs/haskell/scanner.nix
+++ b/krebs/5pkgs/haskell/scanner.nix
@@ -1,12 +1,13 @@
 { mkDerivation, base, fetchgit, stdenv }:
 mkDerivation {
   pname = "scanner";
-  version = "1.0.0";
+  version = "1.0.1";
   src = fetchgit {
-    url = http://cgit.ni.krebsco.de/scanner;
-    rev = "7f091a3bc152ad3974a1873b460fa1759bf8dcad";
+    url = "http://cgit.ni.krebsco.de/scanner";
     sha256 = "1lgl158axczsm4fx53fyq1d4116v91jsx4dbz66ka4k1ljqrmhgn";
+    rev = "7f091a3bc152ad3974a1873b460fa1759bf8dcad";
+    fetchSubmodules = true;
   };
   libraryHaskellDepends = [ base ];
-  license = stdenv.lib.licenses.wtfpl;
+  license = stdenv.lib.licenses.mit;
 }