46f95d8 · stackage · git.iko.soy

git.iko.soy/stackage

on master help sign in

GHC 7.10 testing changes DO NOT MERGE

46f95d8Michael Snoyman12 years ago

Stackage/PerformBuild.hs+11−8

compare with master

unifiedsplit

@@ -168,6 +168,7 @@ performBuild' pb@PerformBuild {..} = withBuildDir $ \builddir -> do

168 $ \ClosedStream Inherited Inherited -> return ()

169 pbLog $ encodeUtf8 "Copying built-in Haddocks\n"

170 copyBuiltInHaddocks (pbDocDir pb)

171+ pbLog $ encodeUtf8 "Finished copying built-in Haddocks\n"

171

172

172 sem <- atomically $ newTSem pbJobs

173 sem <- atomically $ newTSem pbJobs

173 active <- newTVarIO (0 :: Int)

174 active <- newTVarIO (0 :: Int)

@@ -288,7 +289,7 @@ singleBuild pb@PerformBuild {..} SingleBuild {..} =

288 log' t = do

289 log' t = do

289 i <- readTVarIO sbActive

290 i <- readTVarIO sbActive

290 errs <- readTVarIO sbErrsVar

291 errs <- readTVarIO sbErrsVar

291− pbLog $ encodeUtf8 $ concat

292+ when False $ pbLog $ encodeUtf8 $ concat

292 [ t

293 [ t

293 , " (pending: "

294 , " (pending: "

294 , tshow i

295 , tshow i

@@ -367,7 +368,6 @@ singleBuild pb@PerformBuild {..} SingleBuild {..} =

367 args = "haddock"

368 args = "haddock"

368 : "--hyperlink-source"

369 : "--hyperlink-source"

369 : "--html"

370 : "--html"

370− : "--hoogle"

371 : "--html-location=../$pkg-$version/"

372 : hfsOpts

373

@@ -416,12 +416,15 @@ singleBuild pb@PerformBuild {..} SingleBuild {..} =

416 warn t = atomically $ modifyTVar sbWarningsVar (. (t:))

417

418 updateErrs exc = do

419+ case exc' of

420+ DependencyFailed _ -> return ()

421+ _ -> do

419− log' $ concat

422+ log' $ concat

420− [ display (piName sbPackageInfo)

423+ [ display (piName sbPackageInfo)

421− , ": "

424+ , ": "

422− , tshow exc

425+ , tshow exc

423− ]

426+ ]

424− atomically $ modifyTVar sbErrsVar $ insertMap (piName sbPackageInfo) exc'

427+ atomically $ modifyTVar sbErrsVar $ insertMap (piName sbPackageInfo) exc'

425 where

428 where

426 exc' =

429 exc' =

427 case fromException exc of

430 case fromException exc of

build-constraints.yaml+3−19

@@ -2,7 +2,7 @@

2packages:

3 "Michael Snoyman michael@snoyman.com @snoyberg":

4 - bzlib-conduit

5− - cabal-install < 1.19 # GHC 7.10 bumpd to 1.22

5+ - cabal-install

6 - cabal-src

7 - case-insensitive

8 - classy-prelude-yesod

@@ -264,7 +264,7 @@ packages:

264 - monad-products

265 - monad-st

266 - monad-st

267− - mtl < 2.2 # GHC 7.10 bump

267+ - mtl

268 - nats

269 - numeric-extras

270 - parsers

@@ -596,7 +596,7 @@ packages:

596 - hasql-backend

597 - hasql-postgres

598 - list-t

599− - mtl-prelude < 2 # GHC 7.10 bump

599+ - mtl-prelude

600 - neat-interpolation

601 - partial-handler

602 - postgresql-binary

@@ -705,10 +705,6 @@ packages:

705

706 "Stackage upper bounds":

707

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−

712 # https://github.com/fpco/stackage/issues/291

708 # https://github.com/fpco/stackage/issues/291

713 - random < 1.0.1.3

709 - random < 1.0.1.3

714

710

@@ -769,24 +765,12 @@ package-flags:

769 simplelocalnet: true

765 simplelocalnet: true

770 p2p: true

766 p2p: true

771

767

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−

778 logfloat:

768 logfloat:

779 splitbase: true

769 splitbase: true

780

770

781 curl:

771 curl:

782 new-base: true

772 new-base: true

783

773

784− # GHC 7.10 remove

785− aeson:

786− old-locale: true

787− tttool:

788− old-locale: true

789−

790 hxt:

774 hxt:

791 network-uri: true

775 network-uri: true

792 hxt-http:

776 hxt-http: