fe1df29 · stackage · git.iko.soy

git.iko.soy/stackage

Nicer intersect

commitfe1df2935d0c1116bdb67a5884d6a2fcce56b83c authorMichael Snoyman <michael@snoyman.com> dateSun 7 Dec 2014, 12:57 (12 years ago) parenta073ec0

3 files changed+5−2

unifiedsplit

Stackage2/CheckBuildPlan.hs−1

@@ -12,7 +12,6 @@ import Stackage2.Prelude

1212import Stackage2.BuildPlan

1313import Stackage2.PackageDescription

1414import Control.Monad.Writer.Strict (execWriter, Writer, tell)

15−import Distribution.Version (intersectVersionRanges, withinRange)

1615

1716checkBuildPlan :: MonadThrow m => BuildPlan FlatComponent -> m ()

1817checkBuildPlan BuildPlan {..}

Stackage2/PackageDescription.hs−1

@@ -17,7 +17,6 @@ module Stackage2.PackageDescription

1717

1818import Distribution.Package (Dependency (..))

1919import Distribution.PackageDescription

20−import Distribution.Version (withinRange, intersectVersionRanges)

2120import Stackage2.CorePackages

2221import Stackage2.PackageConstraints

2322import Stackage2.PackageIndex

Stackage2/Prelude.hs+5

@@ -18,6 +18,8 @@ import qualified Distribution.Text as DT

1818import Distribution.Version as X (Version (..), VersionRange)

1919import System.Exit (ExitCode (ExitSuccess))

2020import Data.Aeson (ToJSON, FromJSON)

21+import qualified Distribution.Version as C

22+import Distribution.Version as X (withinRange)

2123

2224unPackageName :: PackageName -> Text

2325unPackageName (PackageName str) = pack str

@@ -82,3 +84,6 @@ newtype Maintainer = Maintainer { unMaintainer :: Text }

8284-- | Name of an executable.

8385newtype ExeName = ExeName { unExeName :: Text }

8486 deriving (Show, Eq, Ord, Hashable, ToJSON, FromJSON, IsString)

87+

88+intersectVersionRanges :: VersionRange -> VersionRange -> VersionRange

89+intersectVersionRanges x y = C.simplifyVersionRange $ C.intersectVersionRanges x y