From 46f95d8ddbf10babb8242bc81543f97d27a83e79 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Wed, 24 Dec 2014 12:13:36 +0200
Subject: [PATCH] GHC 7.10 testing changes DO NOT MERGE

---
 Stackage/PerformBuild.hs | 19 +++++++++++--------
 build-constraints.yaml   | 22 +++-------------------
 2 files changed, 14 insertions(+), 27 deletions(-)

diff --git a/Stackage/PerformBuild.hs b/Stackage/PerformBuild.hs
index c74b449a..b1682e4e 100644
--- a/Stackage/PerformBuild.hs
+++ b/Stackage/PerformBuild.hs
@@ -168,6 +168,7 @@ performBuild' pb@PerformBuild {..} = withBuildDir $ \builddir -> do
             $ \ClosedStream Inherited Inherited -> return ()
     pbLog $ encodeUtf8 "Copying built-in Haddocks\n"
     copyBuiltInHaddocks (pbDocDir pb)
+    pbLog $ encodeUtf8 "Finished copying built-in Haddocks\n"
 
     sem <- atomically $ newTSem pbJobs
     active <- newTVarIO (0 :: Int)
@@ -288,7 +289,7 @@ singleBuild pb@PerformBuild {..} SingleBuild {..} =
     log' t = do
         i <- readTVarIO sbActive
         errs <- readTVarIO sbErrsVar
-        pbLog $ encodeUtf8 $ concat
+        when False $ pbLog $ encodeUtf8 $ concat
             [ t
             , " (pending: "
             , tshow i
@@ -367,7 +368,6 @@ singleBuild pb@PerformBuild {..} SingleBuild {..} =
                 args = "haddock"
                      : "--hyperlink-source"
                      : "--html"
-                     : "--hoogle"
                      : "--html-location=../$pkg-$version/"
                      : hfsOpts
 
@@ -416,12 +416,15 @@ singleBuild pb@PerformBuild {..} SingleBuild {..} =
     warn t = atomically $ modifyTVar sbWarningsVar (. (t:))
 
     updateErrs exc = do
-        log' $ concat
-            [ display (piName sbPackageInfo)
-            , ": "
-            , tshow exc
-            ]
-        atomically $ modifyTVar sbErrsVar $ insertMap (piName sbPackageInfo) exc'
+        case exc' of
+            DependencyFailed _ -> return ()
+            _ -> do
+                log' $ concat
+                    [ display (piName sbPackageInfo)
+                    , ": "
+                    , tshow exc
+                    ]
+                atomically $ modifyTVar sbErrsVar $ insertMap (piName sbPackageInfo) exc'
       where
         exc' =
             case fromException exc of
diff --git a/build-constraints.yaml b/build-constraints.yaml
index c4de7765..74b60e4b 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -2,7 +2,7 @@
 packages:
     "Michael Snoyman michael@snoyman.com @snoyberg":
         - bzlib-conduit
-        - cabal-install < 1.19 # GHC 7.10 bumpd to 1.22
+        - cabal-install
         - cabal-src
         - case-insensitive
         - classy-prelude-yesod
@@ -264,7 +264,7 @@ packages:
         - monad-products
         - monad-st
         - monad-st
-        - mtl < 2.2 # GHC 7.10 bump
+        - mtl
         - nats
         - numeric-extras
         - parsers
@@ -596,7 +596,7 @@ packages:
         - hasql-backend
         - hasql-postgres
         - list-t
-        - mtl-prelude < 2 # GHC 7.10 bump
+        - mtl-prelude
         - neat-interpolation
         - partial-handler
         - postgresql-binary
@@ -705,10 +705,6 @@ packages:
 
     "Stackage upper bounds":
 
-        # Force a specific version that's compatible with transformers 0.3
-        - transformers-compat == 0.3.3.3
-        - mtl-compat < 0.2 # https://github.com/fpco/stackage/issues/446
-
         # https://github.com/fpco/stackage/issues/291
         - random < 1.0.1.3
 
@@ -769,24 +765,12 @@ package-flags:
         simplelocalnet: true
         p2p: true
 
-    # GHC 7.10: Remove this
-    # Note that the flag is lower-cased, because that's what Cabal does
-    # Perhaps the codebase should automatically lower case flag names?
-    storable-complex:
-        instanceinbase: false
-
     logfloat:
         splitbase: true
 
     curl:
         new-base: true
 
-    # GHC 7.10 remove
-    aeson:
-        old-locale: true
-    tttool:
-        old-locale: true
-
     hxt:
         network-uri: true
     hxt-http: