Merge pull request #6220 from joachifm/haskell-updates

Fix several haskellPackages build failures 

19 files changed, 51 insertions, 44 deletions

diff --git a/pkgs/development/libraries/haskell/EitherT/default.nix b/pkgs/development/libraries/haskell/EitherT/default.nix
index 66ccb6a8d4e9..234675605309 100644
--- a/pkgs/development/libraries/haskell/EitherT/default.nix
+++ b/pkgs/development/libraries/haskell/EitherT/default.nix
@@ -12,5 +12,7 @@ cabal.mkDerivation (self: {
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
+    hydraPlatforms = self.stdenv.lib.platforms.none;
+    broken = true;
   };
 })
diff --git a/pkgs/development/libraries/haskell/distributed-process-monad-control/default.nix b/pkgs/development/libraries/haskell/distributed-process-monad-control/default.nix
index 14adad138441..d8de329a7deb 100644
--- a/pkgs/development/libraries/haskell/distributed-process-monad-control/default.nix
+++ b/pkgs/development/libraries/haskell/distributed-process-monad-control/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "distributed-process-monad-control";
-  version = "0.5.0";
-  sha256 = "1ja6xwdpssm7wafv2id6c3f49iw7pkks2smk6l1n1dxkh029z8nk";
+  version = "0.5.1";
+  sha256 = "01sdzmb8izsycxshhsg0pbx0mgn10y41df1dj1s66ish0qszw07m";
   buildDepends = [
     distributedProcess monadControl transformers transformersBase
   ];
diff --git a/pkgs/development/libraries/haskell/fb/default.nix b/pkgs/development/libraries/haskell/fb/default.nix
index f257d26c7d32..b325af923d7d 100644
--- a/pkgs/development/libraries/haskell/fb/default.nix
+++ b/pkgs/development/libraries/haskell/fb/default.nix
@@ -10,8 +10,8 @@
 
 cabal.mkDerivation (self: {
   pname = "fb";
-  version = "1.0.7";
-  sha256 = "0ghyddxf4aqidqvbm93pjgaban0whfj4y1w11b7nxy89srhyjhh8";
+  version = "1.0.8";
+  sha256 = "1cv722kkp6lbxajv3ka4088x2491yy41cfypqqkq753mm59x6s9m";
   buildDepends = [
     aeson attoparsec base16Bytestring base64Bytestring cereal conduit
     conduitExtra cryptoApi cryptohash cryptohashCryptoapi dataDefault
@@ -22,7 +22,6 @@ cabal.mkDerivation (self: {
     aeson conduit dataDefault hspec httpConduit HUnit liftedBase
     monadControl QuickCheck resourcet text time transformers
   ];
-  jailbreak = true;
   doCheck = false;
   meta = {
     homepage = "https://github.com/prowdsponsor/fb";
diff --git a/pkgs/development/libraries/haskell/happstack/happstack-server.nix b/pkgs/development/libraries/haskell/happstack/happstack-server.nix
index 24b740736bf7..15a1e90414e4 100644
--- a/pkgs/development/libraries/haskell/happstack/happstack-server.nix
+++ b/pkgs/development/libraries/haskell/happstack/happstack-server.nix
@@ -9,8 +9,8 @@
 
 cabal.mkDerivation (self: {
   pname = "happstack-server";
-  version = "7.3.9";
-  sha256 = "10js2kmxw5lyy1h5xyz7qx852d29cl48qxyvadc4bdad6w06gdlz";
+  version = "7.4.0";
+  sha256 = "009y87g4wika9g0p58v8sdayh41rixkivhvi7j1dnxbm4qy89qpk";
   buildDepends = [
     base64Bytestring blazeHtml extensibleExceptions filepath hslogger
     html monadControl mtl network networkUri parsec sendfile syb
@@ -18,8 +18,6 @@ cabal.mkDerivation (self: {
     transformersBase utf8String xhtml zlib
   ];
   testDepends = [ HUnit parsec zlib ];
-  jailbreak = true;
-  doCheck = false;
   meta = {
     homepage = "http://happstack.com";
     description = "Web related tools and services";
diff --git a/pkgs/development/libraries/haskell/hcltest/default.nix b/pkgs/development/libraries/haskell/hcltest/default.nix
index 579312982aba..c08f9e79bf00 100644
--- a/pkgs/development/libraries/haskell/hcltest/default.nix
+++ b/pkgs/development/libraries/haskell/hcltest/default.nix
@@ -21,5 +21,7 @@ cabal.mkDerivation (self: {
     description = "A testing library for command line applications";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
+    broken = true;
   };
 })
diff --git a/pkgs/development/libraries/haskell/higher-leveldb/default.nix b/pkgs/development/libraries/haskell/higher-leveldb/default.nix
index 07afeea6a928..a25a37741d39 100644
--- a/pkgs/development/libraries/haskell/higher-leveldb/default.nix
+++ b/pkgs/development/libraries/haskell/higher-leveldb/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "higher-leveldb";
-  version = "0.2.0.0";
-  sha256 = "1al8l96ysmcjx3g93ryfr939jqhjqk8g5bvww5gj9mx6pdkqrcm3";
+  version = "0.2.1.0";
+  sha256 = "13bwh9jg7smh8vwgrih79ivi073690l9nn478r5m0w64gbkvdm5p";
   buildDepends = [
     cereal dataDefault leveldbHaskell liftedBase monadControl mtl
     resourcet transformers transformersBase
diff --git a/pkgs/development/libraries/haskell/hsc3-server/default.nix b/pkgs/development/libraries/haskell/hsc3-server/default.nix
index 31f59ed87413..c8e78e4e7ea1 100644
--- a/pkgs/development/libraries/haskell/hsc3-server/default.nix
+++ b/pkgs/development/libraries/haskell/hsc3-server/default.nix
@@ -26,5 +26,7 @@ cabal.mkDerivation (self: {
     description = "SuperCollider server resource management and synchronization";
     license = "GPL";
     platforms = self.ghc.meta.platforms;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
+    broken = true;
   };
 })
diff --git a/pkgs/development/libraries/haskell/iteratee/default.nix b/pkgs/development/libraries/haskell/iteratee/default.nix
index e0130f8ae26a..b0dd47468d9d 100644
--- a/pkgs/development/libraries/haskell/iteratee/default.nix
+++ b/pkgs/development/libraries/haskell/iteratee/default.nix
@@ -23,5 +23,7 @@ cabal.mkDerivation (self: {
     description = "Iteratee-based I/O";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
+    broken = true;
   };
 })
diff --git a/pkgs/development/libraries/haskell/jwt/default.nix b/pkgs/development/libraries/haskell/jwt/default.nix
index 90125ff7a008..dfab13e9132d 100644
--- a/pkgs/development/libraries/haskell/jwt/default.nix
+++ b/pkgs/development/libraries/haskell/jwt/default.nix
@@ -1,9 +1,9 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
 { cabal, aeson, base64Bytestring, cryptohash, dataDefault
-, httpTypes, HUnit, network, networkUri, QuickCheck, scientific
-, semigroups, tasty, tastyHunit, tastyQuickcheck, tastyTh, text
-, time, unorderedContainers, vector
+, httpTypes, HUnit, lens, lensAeson, network, networkUri
+, QuickCheck, scientific, semigroups, tasty, tastyHunit
+, tastyQuickcheck, tastyTh, text, time, unorderedContainers, vector
 }:
 
 cabal.mkDerivation (self: {
@@ -16,8 +16,8 @@ cabal.mkDerivation (self: {
     vector
   ];
   testDepends = [
-    aeson base64Bytestring cryptohash dataDefault httpTypes HUnit
-    network networkUri QuickCheck scientific semigroups tasty
+    aeson base64Bytestring cryptohash dataDefault httpTypes HUnit lens
+    lensAeson network networkUri QuickCheck scientific semigroups tasty
     tastyHunit tastyQuickcheck tastyTh text time unorderedContainers
     vector
   ];
diff --git a/pkgs/development/libraries/haskell/list-t/default.nix b/pkgs/development/libraries/haskell/list-t/default.nix
index 9df455650f5d..442ffc2028ac 100644
--- a/pkgs/development/libraries/haskell/list-t/default.nix
+++ b/pkgs/development/libraries/haskell/list-t/default.nix
@@ -6,12 +6,12 @@
 
 cabal.mkDerivation (self: {
   pname = "list-t";
-  version = "0.3.0";
-  sha256 = "091gz47gisajd2p0iwx0mw99bivfl7wpyddg1ypsvjv2qax94cm9";
+  version = "0.4.2";
+  sha256 = "0n6zc7n5znjas9mgh3a9bn44xv55910i6c3b2l83n4pl9fnad03v";
   buildDepends = [
     basePrelude mmorph monadControl transformers transformersBase
   ];
-  testDepends = [ basePrelude HTF mtlPrelude ];
+  testDepends = [ basePrelude HTF mmorph mtlPrelude ];
   meta = {
     homepage = "https://github.com/nikita-volkov/list-t";
     description = "ListT done right";
diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix
index 21c49c457f90..9775f510d425 100644
--- a/pkgs/development/libraries/haskell/persistent/default.nix
+++ b/pkgs/development/libraries/haskell/persistent/default.nix
@@ -9,8 +9,8 @@
 
 cabal.mkDerivation (self: {
   pname = "persistent";
-  version = "2.1.1";
-  sha256 = "0wmvjizz0zx5i9q5sh8hvsks14q6if4s0dnk63f9mw03jb8jpdd1";
+  version = "2.1.1.4";
+  sha256 = "0nknyrxh28i4cf50fj6mclgd4qnrqsby1w1bzj8jmg8snbyp69d2";
   buildDepends = [
     aeson attoparsec base64Bytestring blazeHtml blazeMarkup conduit
     exceptions fastLogger liftedBase monadControl monadLogger mtl
diff --git a/pkgs/development/libraries/haskell/resource-pool/default.nix b/pkgs/development/libraries/haskell/resource-pool/default.nix
index cb43b927c2e8..76492381c7a1 100644
--- a/pkgs/development/libraries/haskell/resource-pool/default.nix
+++ b/pkgs/development/libraries/haskell/resource-pool/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "resource-pool";
-  version = "0.2.3.1";
-  sha256 = "02fpw5jfzcdhijx8mfpb6j4c8sxl36f04i2nx3cbivh9yhbgqr92";
+  version = "0.2.3.2";
+  sha256 = "04mw8b9djb14zp4rdi6h7mc3zizh597ffiinfbr4m0m8psifw9w6";
   buildDepends = [
     hashable monadControl stm time transformers transformersBase vector
   ];
diff --git a/pkgs/development/libraries/haskell/rest-client/default.nix b/pkgs/development/libraries/haskell/rest-client/default.nix
index 248acc362265..a1a1ce6287b1 100644
--- a/pkgs/development/libraries/haskell/rest-client/default.nix
+++ b/pkgs/development/libraries/haskell/rest-client/default.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "rest-client";
-  version = "0.4.0.1";
-  sha256 = "1bn2kgyr6q0wxlp3kman20wn7jgz5dc6m8rq5xf0mknpbh8rrnpc";
+  version = "0.4.0.5";
+  sha256 = "11rsy9an7ck94ijafqd2ddichz0xgb01w2ybyg3iiwy5ckiy384s";
   buildDepends = [
     aesonUtils caseInsensitive dataDefault exceptionTransformers
     httpConduit httpTypes hxt hxtPickleUtils monadControl mtl primitive
diff --git a/pkgs/development/libraries/haskell/shell-conduit/default.nix b/pkgs/development/libraries/haskell/shell-conduit/default.nix
index ce5507832e13..a93e38b1b821 100644
--- a/pkgs/development/libraries/haskell/shell-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/shell-conduit/default.nix
@@ -19,5 +19,7 @@ cabal.mkDerivation (self: {
     description = "Write shell scripts with Conduit";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
+    broken = true;
   };
 })
diff --git a/pkgs/development/libraries/haskell/simple-conduit/default.nix b/pkgs/development/libraries/haskell/simple-conduit/default.nix
index f1ad007c8f97..49e574772f1b 100644
--- a/pkgs/development/libraries/haskell/simple-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/simple-conduit/default.nix
@@ -16,6 +16,7 @@ cabal.mkDerivation (self: {
     primitive semigroups stm streamingCommons text transformers
     transformersBase vector
   ];
+  jailbreak = true;
   meta = {
     homepage = "http://github.com/jwiegley/simple-conduit";
     description = "A simple streaming I/O library based on monadic folds";
diff --git a/pkgs/development/libraries/haskell/stm-conduit/default.nix b/pkgs/development/libraries/haskell/stm-conduit/default.nix
index da79b401fc6a..c13aa9923173 100644
--- a/pkgs/development/libraries/haskell/stm-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/stm-conduit/default.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "stm-conduit";
-  version = "2.5.2";
-  sha256 = "1r8l9nznavxd0cg30mj7qdp9nq8jlcr0vcv8ljn6lfw67s0pk82x";
+  version = "2.5.3";
+  sha256 = "1jsij92i3rw2wz1166i58p0lxrbx0jndf1hi3kj92ccvnc3zg1iw";
   buildDepends = [
     async cereal cerealConduit conduit conduitExtra liftedAsync
     liftedBase monadControl monadLoops resourcet stm stmChans
diff --git a/pkgs/development/libraries/haskell/webdriver/default.nix b/pkgs/development/libraries/haskell/webdriver/default.nix
index 883359db9ff8..7433f165e4d1 100644
--- a/pkgs/development/libraries/haskell/webdriver/default.nix
+++ b/pkgs/development/libraries/haskell/webdriver/default.nix
@@ -9,8 +9,8 @@
 
 cabal.mkDerivation (self: {
   pname = "webdriver";
-  version = "0.6.0.3";
-  sha256 = "1q0l9rs5j4cxzyqsy6r40y425359s246spk3g3pks7s47yynjn4q";
+  version = "0.6.0.4";
+  sha256 = "1miy65dl60gymf0a65kjykdmsl3cwcjrfg1iiyk6vkjz39y6y7qf";
   buildDepends = [
     aeson attoparsec base64Bytestring cond dataDefault directoryTree
     exceptions filepath httpClient httpTypes liftedBase monadControl
@@ -18,7 +18,6 @@ cabal.mkDerivation (self: {
     transformersBase unorderedContainers vector zipArchive
   ];
   testDepends = [ parallel text ];
-  jailbreak = true;
   doCheck = false;
   meta = {
     homepage = "https://github.com/kallisti-dev/hs-webdriver";
diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix
index 8c87981a6932..571778cfdc4e 100644
--- a/pkgs/development/libraries/haskell/yesod-core/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-core/default.nix
@@ -3,18 +3,18 @@
 { cabal, aeson, async, autoUpdate, blazeBuilder, blazeHtml
 , blazeMarkup, caseInsensitive, cereal, clientsession, conduit
 , conduitExtra, cookie, dataDefault, deepseq, exceptions
-, fastLogger, hspec, httpTypes, HUnit, liftedBase, monadControl
-, monadLogger, mtl, mwcRandom, network, parsec, pathPieces
-, primitive, QuickCheck, random, resourcet, safe, shakespeare
-, streamingCommons, text, time, transformers, transformersBase
-, unixCompat, unorderedContainers, vector, wai, waiExtra, waiLogger
-, warp, word8
+, fastLogger, hspec, hspecExpectations, httpTypes, HUnit
+, liftedBase, monadControl, monadLogger, mtl, mwcRandom, network
+, parsec, pathPieces, primitive, QuickCheck, random, resourcet
+, safe, shakespeare, streamingCommons, text, time, transformers
+, transformersBase, unixCompat, unorderedContainers, vector, wai
+, waiExtra, waiLogger, warp, word8
 }:
 
 cabal.mkDerivation (self: {
   pname = "yesod-core";
-  version = "1.4.6";
-  sha256 = "1xlqqiyn2p0c1qxrkx0mlkp4cra0adhlpw27y03icvj0c93xi27g";
+  version = "1.4.7.2";
+  sha256 = "0k6zsjds594zy0cvnryz071nis3zmv1sjiyn14cc80j0rvjll46y";
   buildDepends = [
     aeson autoUpdate blazeBuilder blazeHtml blazeMarkup caseInsensitive
     cereal clientsession conduit conduitExtra cookie dataDefault
@@ -25,11 +25,11 @@ cabal.mkDerivation (self: {
     word8
   ];
   testDepends = [
-    async blazeBuilder conduit conduitExtra hspec httpTypes HUnit
-    liftedBase mwcRandom network pathPieces QuickCheck random resourcet
-    shakespeare streamingCommons text transformers wai waiExtra
+    async blazeBuilder clientsession conduit conduitExtra cookie hspec
+    hspecExpectations httpTypes HUnit liftedBase mwcRandom network
+    pathPieces QuickCheck random resourcet shakespeare streamingCommons
+    text transformers wai waiExtra
   ];
-  jailbreak = true;
   meta = {
     homepage = "http://www.yesodweb.com/";
     description = "Creation of type-safe, RESTful web applications";
diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix
index 04b4ebee52f1..4b5679512a9f 100644
--- a/pkgs/development/libraries/haskell/yesod/default.nix
+++ b/pkgs/development/libraries/haskell/yesod/default.nix
@@ -9,8 +9,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod";
-  version = "1.4.1.1";
-  sha256 = "0p95f6gjpcl28ysl82hbyxh7fjql6lr5csndmnrd264h2pd88pxx";
+  version = "1.4.1.4";
+  sha256 = "1av6s5nanq5y9fqlzq2yq95989gg1fyqlpzg6y5pl4dcc45srm1x";
   buildDepends = [
     aeson blazeHtml blazeMarkup conduitExtra dataDefault fastLogger
     monadControl monadLogger safe semigroups shakespeare