From 36470b58bd6d5f17da1a534533f9ef36b8ca4a0b Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Fri, 4 Apr 2014 15:41:11 +0300 Subject: [PATCH] A few more 7.8 tweaks --- Stackage/Config.hs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Stackage/Config.hs b/Stackage/Config.hs index d56a47d3..d8847640 100644 --- a/Stackage/Config.hs +++ b/Stackage/Config.hs @@ -142,6 +142,9 @@ defaultExpectedFailures ghcVer = execWriter $ do mapM_ add $ words =<< [ "distributed-process lockfree-queue network-transport-tcp" ] + + -- Pulls in monad-peel which does not compile + when (ghcVer >= GhcMajorVersion 7 8) $ add "monad-control" where add = tell . singleton . PackageName @@ -350,10 +353,6 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do addRange "Michael Snoyman" "hxt" "< 9.3.1" addRange "Michael Snoyman" "network" "< 2.4" - -- https://github.com/fpco/stackage/issues/178 - addRange "Michael Snoyman" "MonadCatchIO-transformers" "< 0.3.1" - addRange "Michael Snoyman" "MonadCatchIO-mtl" "< 0.3.1" - -- https://github.com/fpco/stackage/issues/189 addRange "Michael Snoyman" "statistics" "< 0.11" @@ -381,7 +380,8 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do addRange "Michael Snoyman" "bson" "== 0.2.4" -- Depends on a newer version of happy - addRange "Roman Cheplyaka " "pretty-show" "<= 1.6.1" + when (ghcVer < GhcMajorVersion 7 8) $ + addRange "Roman Cheplyaka " "pretty-show" "<= 1.6.1" -- Version 0.15.3 requires a newer template-haskell addRange "FP Complete " "language-ecmascript" "< 0.15.3"