mirror of
https://github.com/commercialhaskell/stackage.git
synced 2026-01-11 23:08:30 +01:00
Remove all global flags, just use package flags
This commit is contained in:
parent
5d7b7b5082
commit
d39b7bf204
@ -146,8 +146,7 @@ getSystemInfo = do
|
||||
siArch = Distribution.System.X86_64
|
||||
|
||||
data ConstraintFile = ConstraintFile
|
||||
{ cfGlobalFlags :: Map FlagName Bool
|
||||
, cfPackageFlags :: Map PackageName (Map FlagName Bool)
|
||||
{ cfPackageFlags :: Map PackageName (Map FlagName Bool)
|
||||
, cfSkippedTests :: Set PackageName
|
||||
, cfExpectedTestFailures :: Set PackageName
|
||||
, cfExpectedHaddockFailures :: Set PackageName
|
||||
@ -159,7 +158,6 @@ data ConstraintFile = ConstraintFile
|
||||
|
||||
instance FromJSON ConstraintFile where
|
||||
parseJSON = withObject "ConstraintFile" $ \o -> do
|
||||
cfGlobalFlags <- goFlagMap <$> o .: "global-flags"
|
||||
cfPackageFlags <- (goPackageMap . fmap goFlagMap) <$> o .: "package-flags"
|
||||
cfSkippedTests <- getPackages o "skipped-tests"
|
||||
cfExpectedTestFailures <- getPackages o "expected-test-failures"
|
||||
@ -210,7 +208,6 @@ toBC ConstraintFile {..} = do
|
||||
| name `member` cfExpectedHaddockFailures = ExpectFailure
|
||||
|
||||
| otherwise = ExpectSuccess
|
||||
pcFlagOverrides = fromMaybe mempty (lookup name cfPackageFlags) ++
|
||||
cfGlobalFlags
|
||||
pcFlagOverrides = fromMaybe mempty $ lookup name cfPackageFlags
|
||||
|
||||
bcGithubUsers = cfGithubUsers
|
||||
|
||||
@ -649,18 +649,6 @@ packages:
|
||||
# for language-ecmascript as well.
|
||||
- language-ecmascript < 0.17
|
||||
|
||||
# Global flags are applied to all packages
|
||||
global-flags:
|
||||
blaze_html_0_5: true
|
||||
small_base: true
|
||||
https: true
|
||||
splitbase: true
|
||||
old-locale: true
|
||||
new-base: true
|
||||
bytestring-in-base: false
|
||||
test-hlint: false
|
||||
network-uri: true
|
||||
|
||||
# Package flags are applied to individual packages, and override the values of
|
||||
# global-flags
|
||||
package-flags:
|
||||
@ -684,6 +672,26 @@ package-flags:
|
||||
storable-complex:
|
||||
instanceinbase: false
|
||||
|
||||
logfloat:
|
||||
splitbase: true
|
||||
|
||||
curl:
|
||||
new-base: true
|
||||
|
||||
# GHC 7.10 remove
|
||||
aeson:
|
||||
old-locale: true
|
||||
|
||||
hxt:
|
||||
network-uri: true
|
||||
hxt-http:
|
||||
network-uri: true
|
||||
hxt-relaxng:
|
||||
network-uri: true
|
||||
|
||||
pandoc:
|
||||
https: true
|
||||
|
||||
# By skipping a test suite, we do not pull in the build dependencies
|
||||
skipped-tests:
|
||||
- ReadArgs # old version of hspec
|
||||
|
||||
Loading…
Reference in New Issue
Block a user