Merge master into x-updates

pkgs/development/tools/documentation/haddock/2.14.1.nix

@@ -0,0 +1,22 @@
+{ cabal, alex, Cabal, deepseq, filepath, ghcPaths, happy, hspec
+, QuickCheck, xhtml
+}:
+
+cabal.mkDerivation (self: {
+  pname = "haddock";
+  version = "2.14.1";
+  sha256 = "1mxkphzdfd5c8dklfl09ajqwhw8ibvzl0cqrfr2j8rn0j03w46x6";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [ Cabal deepseq filepath ghcPaths xhtml ];
+  testDepends = [ Cabal deepseq filepath hspec QuickCheck ];
+  buildTools = [ alex happy ];
+  doCheck = false;
+  meta = {
+    homepage = "http://www.haskell.org/haddock/";
+    description = "A documentation-generation tool for Haskell libraries";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
+  };
+})

pkgs/development/tools/haskell/cake3/default.nix

@@ -0,0 +1,23 @@
+{ cabal, attoparsec, deepseq, filepath, haskellSrcMeta
+, languageJavascript, mimeTypes, monadloc, mtl, optparseApplicative
+, syb, systemFilepath, text, textFormat
+}:
+
+cabal.mkDerivation (self: {
+  pname = "cake3";
+  version = "0.4.0.0";
+  sha256 = "15v50m60fr2mgfm2irxfaw4pi2s3bx187p0y0ns20rqfy0dasxyx";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    attoparsec deepseq filepath haskellSrcMeta languageJavascript
+    mimeTypes monadloc mtl optparseApplicative syb systemFilepath text
+    textFormat
+  ];
+  meta = {
+    homepage = "https://github.com/grwlf/cake3";
+    description = "Third cake the Makefile EDSL";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})

pkgs/development/tools/haskell/keter/default.nix

@@ -1,17 +1,16 @@
 { cabal, aeson, async, attoparsec, blazeBuilder, caseInsensitive
-, conduit, dataDefault, filepath, fsnotify, httpClient
+, conduit, dataDefault, filepath, fsnotify, hspec, httpClient
 , httpClientConduit, httpConduit, httpReverseProxy, httpTypes
 , liftedBase, mtl, network, networkConduit, networkConduitTls
 , random, regexTdfa, stm, systemFileio, systemFilepath, tar, text
-, time, transformers, unixCompat, unixProcessConduit
-, unorderedContainers, vector, wai, waiAppStatic, waiExtra, warp
-, warpTls, yaml, zlib
+, time, transformers, unixCompat, unorderedContainers, vector, wai
+, waiAppStatic, waiExtra, warp, warpTls, yaml, zlib
 }:
 
 cabal.mkDerivation (self: {
   pname = "keter";
-  version = "1.2.0";
-  sha256 = "06iz01ci1mcxjqs7dknxgjlkl783sdf680b54schxxirg268cxh3";
+  version = "1.2.1";
+  sha256 = "160kw3c2h9i1rwhicm860ahanx9p9qskrnfxsa68484j0cmw1ga9";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
@@ -20,9 +19,10 @@ cabal.mkDerivation (self: {
     httpConduit httpReverseProxy httpTypes liftedBase mtl network
     networkConduit networkConduitTls random regexTdfa stm systemFileio
     systemFilepath tar text time transformers unixCompat
-    unixProcessConduit unorderedContainers vector wai waiAppStatic
-    waiExtra warp warpTls yaml zlib
+    unorderedContainers vector wai waiAppStatic waiExtra warp warpTls
+    yaml zlib
   ];
+  testDepends = [ conduit hspec transformers ];
   meta = {
     homepage = "http://www.yesodweb.com/";
     description = "Web application deployment manager, focusing on Haskell web frameworks";