6de04c4 · stackage · git.iko.soy

Stackage/Build.hs+4

compare with master

unifiedsplit

@@ -27,6 +27,10 @@ defaultBuildSettings :: Maybe Int -- ^ argument to -j

27defaultBuildSettings cores version = BuildSettings

28 { sandboxRoot = "sandbox"

29 , expectedFailuresBuild = defaultExpectedFailures version

30+ -- FIXME This is a hack. In fact, this whole thing is a hack. The

31+ -- expected failures should be written to the build-plan.txt file and

32+ -- read from there.

33+ False

30 , extraArgs = \bs -> "-fnetwork23" : "-fhttps" :

34 , extraArgs = \bs -> "-fnetwork23" : "-fhttps" :

31 case bs of

35 case bs of

32 BSTest -> []

36 BSTest -> []

Stackage/Config.hs+12−1

@@ -20,8 +20,9 @@ defaultExtraCore _ = fromList $ map PackageName $ words

20-- will still be run and logs kept, but a failure will not indicate an

21-- error in our package combination.

22defaultExpectedFailures :: GhcMajorVersion

23+ -> Bool -- ^ haskell platform

23 -> Set PackageName

24 -> Set PackageName

24−defaultExpectedFailures ghcVer = execWriter $ do

25+defaultExpectedFailures ghcVer requireHP = execWriter $ do

25 -- Requires an old version of WAI and Warp for tests

26 -- Requires an old version of WAI and Warp for tests

26 add "HTTP"

27 add "HTTP"

27

28

@@ -219,6 +220,16 @@ defaultExpectedFailures ghcVer = execWriter $ do

219

220

220 -- Requires locally running server

221 -- Requires locally running server

221 add "bloodhound"

222 add "bloodhound"

223+

224+ when (ghcVer == GhcMajorVersion 7 8 && requireHP) $ do

225+ -- https://github.com/ndmitchell/extra/issues/2

226+ add "extra"

227+

228+ -- https://github.com/vincenthz/hs-asn1/issues/11

229+ add "asn1-encoding"

230+

231+ -- https://github.com/vincenthz/hs-tls/issues/84

232+ add "tls"

222 where

233 where

223 add = tell . singleton . PackageName

234 add = tell . singleton . PackageName

224

235

Stackage/Select.hs+5−3

@@ -18,10 +18,12 @@ import Stackage.InstallInfo

18import Stackage.Types

19import Stackage.Util

20

21−defaultSelectSettings :: GhcMajorVersion -> SelectSettings

21+defaultSelectSettings :: GhcMajorVersion

22+ -> Bool -- ^ haskell platform?

23+ -> SelectSettings

22−defaultSelectSettings version = SelectSettings

24+defaultSelectSettings version requireHP = SelectSettings

23 { extraCore = defaultExtraCore version

25 { extraCore = defaultExtraCore version

24− , expectedFailuresSelect = defaultExpectedFailures version

26+ , expectedFailuresSelect = defaultExpectedFailures version requireHP

25 , stablePackages = defaultStablePackages version

27 , stablePackages = defaultStablePackages version

26 , haskellPlatformDir = "hp"

28 , haskellPlatformDir = "hp"

27 , requireHaskellPlatform = True

29 , requireHaskellPlatform = True

app/stackage.hs+1−1

@@ -103,7 +103,7 @@ main = do

103 SelectArgs {..} <- parseSelectArgs rest

104 ghcVersion <- getGhcVersion

105 bp <- select

106− (defaultSelectSettings ghcVersion)

106+ (defaultSelectSettings ghcVersion $ not noPlatform)

107 { excludedPackages = fromList $ map PackageName excluded

108 , requireHaskellPlatform = not noPlatform

109 , ignoreUpgradeableCore = ignoreUpgradeable