on master help sign in
PackageConstraints rename
commite360a857cde4dd13666a01cbeab111bb26280e3d authorMichael Snoyman <michael@snoyman.com> dateThu 4 Dec 2014, 14:34 (12 years ago) parenta97335f
2 files changed+12−12
Stackage2/ProposedPlan.hs → Stackage2/PackageConstraints.hs+11−11 stackage.cabal+1−1
Stackage2/ProposedPlan.hs → Stackage2/PackageConstraints.hsrenamed+11−11
@@ -1,30 +1,30 @@
11{-# LANGUAGE NoImplicitPrelude #-}
22{-# LANGUAGE OverloadedStrings #-}
3−-- | Get the proposed build plan.
4−module Stackage2.ProposedPlan
5− ( ProposedPlan (..)
6− , defaultProposedPlan
3+-- | The constraints on package selection for a new build plan.
4+module Stackage2.PackageConstraints
5+ ( PackageConstraints (..)
6+ , defaultPackageConstraints
77 ) where
88
99import Stackage2.Prelude
1010import qualified Stackage.Config as Old
1111import qualified Stackage.Types as Old
1212
13−data ProposedPlan = ProposedPlan
14− { ppPackages :: Map PackageName (VersionRange, Maintainer)
13+data PackageConstraints = PackageConstraints
14+ { pcPackages :: Map PackageName (VersionRange, Maintainer)
1515 -- ^ This does not include core packages or dependencies, just packages
1616 -- added by some maintainer.
17− , ppExpectedFailures :: Set PackageName
17+ , pcExpectedFailures :: Set PackageName
1818 -- ^ At some point in the future, we should split this into Haddock
1919 -- failures, test failures, etc.
2020 }
2121
2222-- | The proposed plan from the requirements provided by contributors.
23−defaultProposedPlan :: ProposedPlan
24−defaultProposedPlan = ProposedPlan
25− { ppPackages = fmap (Maintainer . pack . Old.unMaintainer)
23+defaultPackageConstraints :: PackageConstraints
24+defaultPackageConstraints = PackageConstraints
25+ { pcPackages = fmap (Maintainer . pack . Old.unMaintainer)
2626 <$> Old.defaultStablePackages ghcVer False
27− , ppExpectedFailures = Old.defaultExpectedFailures ghcVer False
27+ , pcExpectedFailures = Old.defaultExpectedFailures ghcVer False
2828 }
2929 where
3030 ghcVer = Old.GhcMajorVersion 7 8
stackage.cabal+1−1
@@ -32,7 +32,7 @@ library
3232 Stackage.ServerFiles
3333
3434 Stackage2.Prelude
35− Stackage2.ProposedPlan
35+ Stackage2.PackageConstraints
3636 Stackage2.CorePackages
3737 Stackage2.PackageIndex
3838 build-depends: base >= 4 && < 5