on master help sign in
GHC 7.10 testing changes DO NOT MERGE
commit46f95d8ddbf10babb8242bc81543f97d27a83e79 authorMichael Snoyman <michael@snoyman.com> dateWed 24 Dec 2014, 12:13 (12 years ago) parente62226e
2 files changed+14−27
Stackage/PerformBuild.hs+11−8 build-constraints.yaml+3−19
Stackage/PerformBuild.hs+11−8
@@ -168,6 +168,7 @@ performBuild' pb@PerformBuild {..} = withBuildDir $ \builddir -> do
168168 $ \ClosedStream Inherited Inherited -> return ()
169169 pbLog $ encodeUtf8 "Copying built-in Haddocks\n"
170170 copyBuiltInHaddocks (pbDocDir pb)
171+ pbLog $ encodeUtf8 "Finished copying built-in Haddocks\n"
171172
172173 sem <- atomically $ newTSem pbJobs
173174 active <- newTVarIO (0 :: Int)
@@ -288,7 +289,7 @@ singleBuild pb@PerformBuild {..} SingleBuild {..} =
288289 log' t = do
289290 i <- readTVarIO sbActive
290291 errs <- readTVarIO sbErrsVar
291− pbLog $ encodeUtf8 $ concat
292+ when False $ pbLog $ encodeUtf8 $ concat
292293 [ t
293294 , " (pending: "
294295 , tshow i
@@ -367,7 +368,6 @@ singleBuild pb@PerformBuild {..} SingleBuild {..} =
367368 args = "haddock"
368369 : "--hyperlink-source"
369370 : "--html"
370− : "--hoogle"
371371 : "--html-location=../$pkg-$version/"
372372 : hfsOpts
373373
@@ -416,12 +416,15 @@ singleBuild pb@PerformBuild {..} SingleBuild {..} =
416416 warn t = atomically $ modifyTVar sbWarningsVar (. (t:))
417417
418418 updateErrs exc = do
419− log' $ concat
420− [ display (piName sbPackageInfo)
421− , ": "
422− , tshow exc
423− ]
424− atomically $ modifyTVar sbErrsVar $ insertMap (piName sbPackageInfo) exc'
419+ case exc' of
420+ DependencyFailed _ -> return ()
421+ _ -> do
422+ log' $ concat
423+ [ display (piName sbPackageInfo)
424+ , ": "
425+ , tshow exc
426+ ]
427+ atomically $ modifyTVar sbErrsVar $ insertMap (piName sbPackageInfo) exc'
425428 where
426429 exc' =
427430 case fromException exc of
build-constraints.yaml+3−19
@@ -2,7 +2,7 @@
22packages:
33 "Michael Snoyman michael@snoyman.com @snoyberg":
44 - bzlib-conduit
5− - cabal-install < 1.19 # GHC 7.10 bumpd to 1.22
5+ - cabal-install
66 - cabal-src
77 - case-insensitive
88 - classy-prelude-yesod
@@ -264,7 +264,7 @@ packages:
264264 - monad-products
265265 - monad-st
266266 - monad-st
267− - mtl < 2.2 # GHC 7.10 bump
267+ - mtl
268268 - nats
269269 - numeric-extras
270270 - parsers
@@ -596,7 +596,7 @@ packages:
596596 - hasql-backend
597597 - hasql-postgres
598598 - list-t
599− - mtl-prelude < 2 # GHC 7.10 bump
599+ - mtl-prelude
600600 - neat-interpolation
601601 - partial-handler
602602 - postgresql-binary
@@ -705,10 +705,6 @@ packages:
705705
706706 "Stackage upper bounds":
707707
708− # Force a specific version that's compatible with transformers 0.3
709− - transformers-compat == 0.3.3.3
710− - mtl-compat < 0.2 # https://github.com/fpco/stackage/issues/446
711−
712708 # https://github.com/fpco/stackage/issues/291
713709 - random < 1.0.1.3
714710
@@ -769,24 +765,12 @@ package-flags:
769765 simplelocalnet: true
770766 p2p: true
771767
772− # GHC 7.10: Remove this
773− # Note that the flag is lower-cased, because that's what Cabal does
774− # Perhaps the codebase should automatically lower case flag names?
775− storable-complex:
776− instanceinbase: false
777−
778768 logfloat:
779769 splitbase: true
780770
781771 curl:
782772 new-base: true
783773
784− # GHC 7.10 remove
785− aeson:
786− old-locale: true
787− tttool:
788− old-locale: true
789−
790774 hxt:
791775 network-uri: true
792776 hxt-http: