haskell/stackage
1
0
Fork 0
mirror of https://github.com/commercialhaskell/stackage.git synced 2026-01-31 00:20:26 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix tests

Browse Source
This commit is contained in:
Michael Snoyman 2014-12-08 12:36:36 +02:00
parent 09c02158c3
commit ed6e673a1a
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Stackage2/UpdateBuildPlan.hs
View File

@ -12,7 +12,7 @@ import Stackage2.Prelude
import Stackage2.BuildPlan import Stackage2.BuildPlan
import Stackage2.BuildConstraints import Stackage2.BuildConstraints
import Stackage2.PackageDescription import Stackage2.PackageDescription
import Distribution.Version (orLaterVersion, earlierVersion) import Distribution.Version (orLaterVersion, earlierVersion, anyVersion)
import qualified Data.Map as Map import qualified Data.Map as Map
updateBuildPlan :: BuildPlan a -> IO (BuildPlan FlatComponent) updateBuildPlan :: BuildPlan a -> IO (BuildPlan FlatComponent)
@ -25,19 +25,23 @@ updateBuildConstraints BuildPlan {..} =
bcSystemInfo = bpSystemInfo bcSystemInfo = bpSystemInfo
bcPackages = Map.keysSet bpPackages bcPackages = Map.keysSet bpPackages
bcPackageConstraints name = bcPackageConstraints name = PackageConstraints
PackageConstraints {..} { pcVersionRange = addBumpRange (maybe anyVersion pcVersionRange moldPC)
, pcMaintainer = moldPC >>= pcMaintainer
, pcTests = maybe ExpectSuccess pcTests moldPC
, pcHaddocks = maybe ExpectSuccess pcHaddocks moldPC
, pcBuildBenchmarks = maybe True pcBuildBenchmarks moldPC
, pcFlagOverrides = maybe mempty pcFlagOverrides moldPC
}
where where
{- moldBP = lookup name bpPackages
pcPackages = flip map bpExtra $ \pb -> moldPC = pbPackageConstraints <$> moldBP
( intersectVersionRanges (bumpRange (pbVersion pb)) (pbVersionRange pb)
, pbMaintainer pb addBumpRange oldRange =
) case moldBP of
pcTests = maybe ExpectSuccess pbTestState . flip lookup bpExtra Nothing -> oldRange
pcHaddocks = maybe ExpectSuccess pbHaddockState . flip lookup bpExtra Just bp -> intersectVersionRanges oldRange
pcBuildBenchmark = maybe True pbTryBuildBenchmark . flip lookup bpExtra $ bumpRange $ pbVersion bp
pcFlagOverrides = maybe mempty pbFlags . flip lookup bpExtra
-}
bumpRange version = intersectVersionRanges bumpRange version = intersectVersionRanges
(orLaterVersion version) (orLaterVersion version)