git.iko.soy/stackage
on master help sign in
Remove all global flags, just use package flags
commitd39b7bf2040c2c3e8fcc762716b703eb08e50f68 authorMichael Snoyman <michael@snoyman.com> dateFri 2 Jan 2015, 09:11 (12 years ago) parent5d7b7b5
2 files changed+22−17
compare with master
unifiedsplit
Stackage/BuildConstraints.hs+2−5 build-constraints.yaml+20−12
Stackage/BuildConstraints.hs+2−5
@@ -146,8 +146,7 @@ getSystemInfo = do
146146 siArch = Distribution.System.X86_64
147147
148148data ConstraintFile = ConstraintFile
149− { cfGlobalFlags :: Map FlagName Bool
150− , cfPackageFlags :: Map PackageName (Map FlagName Bool)
149+ { cfPackageFlags :: Map PackageName (Map FlagName Bool)
151150 , cfSkippedTests :: Set PackageName
152151 , cfExpectedTestFailures :: Set PackageName
153152 , cfExpectedHaddockFailures :: Set PackageName
@@ -159,7 +158,6 @@ data ConstraintFile = ConstraintFile
159158
160159instance FromJSON ConstraintFile where
161160 parseJSON = withObject "ConstraintFile" $ \o -> do
162− cfGlobalFlags <- goFlagMap <$> o .: "global-flags"
163161 cfPackageFlags <- (goPackageMap . fmap goFlagMap) <$> o .: "package-flags"
164162 cfSkippedTests <- getPackages o "skipped-tests"
165163 cfExpectedTestFailures <- getPackages o "expected-test-failures"
@@ -210,7 +208,6 @@ toBC ConstraintFile {..} = do
210208 | name `member` cfExpectedHaddockFailures = ExpectFailure
211209
212210 | otherwise = ExpectSuccess
213− pcFlagOverrides = fromMaybe mempty (lookup name cfPackageFlags) ++
214− cfGlobalFlags
211+ pcFlagOverrides = fromMaybe mempty $ lookup name cfPackageFlags
215212
216213 bcGithubUsers = cfGithubUsers
build-constraints.yaml+20−12
@@ -649,18 +649,6 @@ packages:
649649 # for language-ecmascript as well.
650650 - language-ecmascript < 0.17
651651
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−
664652# Package flags are applied to individual packages, and override the values of
665653# global-flags
666654package-flags:
@@ -684,6 +672,26 @@ package-flags:
684672 storable-complex:
685673 instanceinbase: false
686674
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+
687695# By skipping a test suite, we do not pull in the build dependencies
688696skipped-tests:
689697 - ReadArgs # old version of hspec