@@ -1,30 +1,30 @@
1{-# LANGUAGE NoImplicitPrelude #-}
1{-# LANGUAGE NoImplicitPrelude #-}
2{-# LANGUAGE OverloadedStrings #-}
2{-# LANGUAGE OverloadedStrings #-}
3−-- | Get the proposed build plan.
3+-- | The constraints on package selection for a new build plan.
4−module Stackage2.ProposedPlan
4+module Stackage2.PackageConstraints
5− ( ProposedPlan (..)
5+ ( PackageConstraints (..)
6− , defaultProposedPlan
6+ , defaultPackageConstraints
9import Stackage2.Prelude
9import Stackage2.Prelude
10import qualified Stackage.Config as Old
10import qualified Stackage.Config as Old
11import qualified Stackage.Types as Old
11import qualified Stackage.Types as Old
13−data ProposedPlan = ProposedPlan
13+data PackageConstraints = PackageConstraints
14− { ppPackages :: Map PackageName (VersionRange, Maintainer)
14+ { pcPackages :: Map PackageName (VersionRange, Maintainer)
15 -- ^ This does not include core packages or dependencies, just packages
15 -- ^ This does not include core packages or dependencies, just packages
16 -- added by some maintainer.
16 -- added by some maintainer.
17− , ppExpectedFailures :: Set PackageName
17+ , pcExpectedFailures :: Set PackageName
18 -- ^ At some point in the future, we should split this into Haddock
18 -- ^ At some point in the future, we should split this into Haddock
19 -- failures, test failures, etc.
19 -- failures, test failures, etc.
22-- | The proposed plan from the requirements provided by contributors.
22-- | The proposed plan from the requirements provided by contributors.
23−defaultProposedPlan :: ProposedPlan
23+defaultPackageConstraints :: PackageConstraints
24−defaultProposedPlan = ProposedPlan
24+defaultPackageConstraints = PackageConstraints
25− { ppPackages = fmap (Maintainer . pack . Old.unMaintainer)
25+ { pcPackages = fmap (Maintainer . pack . Old.unMaintainer)
26 <$> Old.defaultStablePackages ghcVer False
26 <$> Old.defaultStablePackages ghcVer False
27− , ppExpectedFailures = Old.defaultExpectedFailures ghcVer False
27+ , pcExpectedFailures = Old.defaultExpectedFailures ghcVer False
30 ghcVer = Old.GhcMajorVersion 7 8
30 ghcVer = Old.GhcMajorVersion 7 8