Merge remote-tracking branch 'lass/20.09' into 20.09

2 files changed, 22 insertions, 15 deletions

diff --git a/krebs/5pkgs/haskell/email-header.nix b/krebs/5pkgs/haskell/email-header.nix
index 572a8029c..b1e8e1153 100644
--- a/krebs/5pkgs/haskell/email-header.nix
+++ b/krebs/5pkgs/haskell/email-header.nix
@@ -11,9 +11,9 @@ with import <stockholm/lib>;
       sha256 = "12j2n3sbvzjnw99gga7kkdygm8n3qx2lh8q26ad6a53xm5whnz59";
     };
   }.${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/much.nix b/krebs/5pkgs/haskell/much.nix
index db168f8a1..0a5453c0c 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;
 }