diff --git a/Stackage2/CheckBuildPlan.hs b/Stackage2/CheckBuildPlan.hs index ce728f51..44b96788 100644 --- a/Stackage2/CheckBuildPlan.hs +++ b/Stackage2/CheckBuildPlan.hs @@ -12,7 +12,6 @@ import Stackage2.Prelude import Stackage2.BuildPlan import Stackage2.PackageDescription import Control.Monad.Writer.Strict (execWriter, Writer, tell) -import Distribution.Version (intersectVersionRanges, withinRange) checkBuildPlan :: MonadThrow m => BuildPlan FlatComponent -> m () checkBuildPlan BuildPlan {..} diff --git a/Stackage2/PackageDescription.hs b/Stackage2/PackageDescription.hs index 68cdd650..736bc4db 100644 --- a/Stackage2/PackageDescription.hs +++ b/Stackage2/PackageDescription.hs @@ -17,7 +17,6 @@ module Stackage2.PackageDescription import Distribution.Package (Dependency (..)) import Distribution.PackageDescription -import Distribution.Version (withinRange, intersectVersionRanges) import Stackage2.CorePackages import Stackage2.PackageConstraints import Stackage2.PackageIndex diff --git a/Stackage2/Prelude.hs b/Stackage2/Prelude.hs index 9250f5a9..a9324ec1 100644 --- a/Stackage2/Prelude.hs +++ b/Stackage2/Prelude.hs @@ -18,6 +18,8 @@ import qualified Distribution.Text as DT import Distribution.Version as X (Version (..), VersionRange) import System.Exit (ExitCode (ExitSuccess)) import Data.Aeson (ToJSON, FromJSON) +import qualified Distribution.Version as C +import Distribution.Version as X (withinRange) unPackageName :: PackageName -> Text unPackageName (PackageName str) = pack str @@ -82,3 +84,6 @@ newtype Maintainer = Maintainer { unMaintainer :: Text } -- | Name of an executable. newtype ExeName = ExeName { unExeName :: Text } deriving (Show, Eq, Ord, Hashable, ToJSON, FromJSON, IsString) + +intersectVersionRanges :: VersionRange -> VersionRange -> VersionRange +intersectVersionRanges x y = C.simplifyVersionRange $ C.intersectVersionRanges x y