@@ -12,7 +12,7 @@ import Stackage2.Prelude
1212import Stackage2.BuildPlan
1313import Stackage2.BuildConstraints
1414import Stackage2.PackageDescription
15−import Distribution.Version (orLaterVersion, earlierVersion)
15+import Distribution.Version (orLaterVersion, earlierVersion, anyVersion)
1616import qualified Data.Map as Map
1717
1818updateBuildPlan :: BuildPlan a -> IO (BuildPlan FlatComponent)
@@ -25,19 +25,23 @@ updateBuildConstraints BuildPlan {..} =
2525 bcSystemInfo = bpSystemInfo
2626 bcPackages = Map.keysSet bpPackages
2727
28− bcPackageConstraints name =
29− PackageConstraints {..}
28+ bcPackageConstraints name = PackageConstraints
29+ { pcVersionRange = addBumpRange (maybe anyVersion pcVersionRange moldPC)
30+ , pcMaintainer = moldPC >>= pcMaintainer
31+ , pcTests = maybe ExpectSuccess pcTests moldPC
32+ , pcHaddocks = maybe ExpectSuccess pcHaddocks moldPC
33+ , pcBuildBenchmarks = maybe True pcBuildBenchmarks moldPC
34+ , pcFlagOverrides = maybe mempty pcFlagOverrides moldPC
35+ }
3036 where
31− {-
32− pcPackages = flip map bpExtra $ \pb ->
33− ( intersectVersionRanges (bumpRange (pbVersion pb)) (pbVersionRange pb)
34− , pbMaintainer pb
35− )
36− pcTests = maybe ExpectSuccess pbTestState . flip lookup bpExtra
37− pcHaddocks = maybe ExpectSuccess pbHaddockState . flip lookup bpExtra
38− pcBuildBenchmark = maybe True pbTryBuildBenchmark . flip lookup bpExtra
39− pcFlagOverrides = maybe mempty pbFlags . flip lookup bpExtra
40− -}
37+ moldBP = lookup name bpPackages
38+ moldPC = pbPackageConstraints <$> moldBP
39+
40+ addBumpRange oldRange =
41+ case moldBP of
42+ Nothing -> oldRange
43+ Just bp -> intersectVersionRanges oldRange
44+ $ bumpRange $ pbVersion bp
4145
4246 bumpRange version = intersectVersionRanges
4347 (orLaterVersion version)