git.iko.soy/stackage
on master help sign in
Remove all global flags, just use package flags
d39b7bfMichael Snoyman
Stackage/BuildConstraints.hs+2−5
compare with master
unifiedsplit
@@ -146,8 +146,7 @@ getSystemInfo = do
146 siArch = Distribution.System.X86_64
146 siArch = Distribution.System.X86_64
147
147
148data ConstraintFile = ConstraintFile
148data ConstraintFile = ConstraintFile
149− { cfGlobalFlags :: Map FlagName Bool
150− , cfPackageFlags :: Map PackageName (Map FlagName Bool)
149+ { cfPackageFlags :: Map PackageName (Map FlagName Bool)
151 , cfSkippedTests :: Set PackageName
150 , cfSkippedTests :: Set PackageName
152 , cfExpectedTestFailures :: Set PackageName
151 , cfExpectedTestFailures :: Set PackageName
153 , cfExpectedHaddockFailures :: Set PackageName
152 , cfExpectedHaddockFailures :: Set PackageName
@@ -159,7 +158,6 @@ data ConstraintFile = ConstraintFile
159
158
160instance FromJSON ConstraintFile where
159instance FromJSON ConstraintFile where
161 parseJSON = withObject "ConstraintFile" $ \o -> do
160 parseJSON = withObject "ConstraintFile" $ \o -> do
162− cfGlobalFlags <- goFlagMap <$> o .: "global-flags"
163 cfPackageFlags <- (goPackageMap . fmap goFlagMap) <$> o .: "package-flags"
161 cfPackageFlags <- (goPackageMap . fmap goFlagMap) <$> o .: "package-flags"
164 cfSkippedTests <- getPackages o "skipped-tests"
162 cfSkippedTests <- getPackages o "skipped-tests"
165 cfExpectedTestFailures <- getPackages o "expected-test-failures"
163 cfExpectedTestFailures <- getPackages o "expected-test-failures"
@@ -210,7 +208,6 @@ toBC ConstraintFile {..} = do
210 | name `member` cfExpectedHaddockFailures = ExpectFailure
208 | name `member` cfExpectedHaddockFailures = ExpectFailure
211
209
212 | otherwise = ExpectSuccess
210 | otherwise = ExpectSuccess
213− pcFlagOverrides = fromMaybe mempty (lookup name cfPackageFlags) ++
211+ pcFlagOverrides = fromMaybe mempty $ lookup name cfPackageFlags
214− cfGlobalFlags
215
212
216 bcGithubUsers = cfGithubUsers
213 bcGithubUsers = cfGithubUsers
build-constraints.yaml+20−12
@@ -649,18 +649,6 @@ packages:
649 # for language-ecmascript as well.
649 # for language-ecmascript as well.
650 - language-ecmascript < 0.17
650 - language-ecmascript < 0.17
651
651
652−# Global flags are applied to all packages
653−global-flags:
654− blaze_html_0_5: true
655− small_base: true
656− https: true
657− splitbase: true
658− old-locale: true
659− new-base: true
660− bytestring-in-base: false
661− test-hlint: false
662− network-uri: true
663−
664# Package flags are applied to individual packages, and override the values of
652# Package flags are applied to individual packages, and override the values of
665# global-flags
653# global-flags
666package-flags:
654package-flags:
@@ -684,6 +672,26 @@ package-flags:
684 storable-complex:
672 storable-complex:
685 instanceinbase: false
673 instanceinbase: false
686
674
675+ logfloat:
676+ splitbase: true
677+
678+ curl:
679+ new-base: true
680+
681+ # GHC 7.10 remove
682+ aeson:
683+ old-locale: true
684+
685+ hxt:
686+ network-uri: true
687+ hxt-http:
688+ network-uri: true
689+ hxt-relaxng:
690+ network-uri: true
691+
692+ pandoc:
693+ https: true
694+
687# By skipping a test suite, we do not pull in the build dependencies
695# By skipping a test suite, we do not pull in the build dependencies
688skipped-tests:
696skipped-tests:
689 - ReadArgs # old version of hspec
697 - ReadArgs # old version of hspec