From 6af6131a18953e469fa67a57fd7b287dcbe5d6fb Mon Sep 17 00:00:00 2001
From: Oleg Grenrus <oleg.grenrus@iki.fi>
Date: Thu, 20 Dec 2018 20:22:35 +0200
Subject: [PATCH] Move PackageVersionConstraint to cabal-install
Nothing in Cabal-the-lib uses the type => moving to the client.
---
Cabal/Cabal.cabal | 1 -
cabal-install/Distribution/Client/Configure.hs | 2 +-
cabal-install/Distribution/Client/Install.hs | 2 +-
.../Distribution/Client}/PackageVersionConstraint.hs | 4 ++--
cabal-install/Distribution/Client/ProjectConfig.hs | 2 +-
cabal-install/Distribution/Client/ProjectConfig/Legacy.hs | 2 +-
cabal-install/Distribution/Client/ProjectConfig/Types.hs | 2 +-
cabal-install/Distribution/Client/ProjectPlanning.hs | 2 +-
cabal-install/Distribution/Client/Setup.hs | 2 +-
cabal-install/Distribution/Deprecated/Text.hs | 2 +-
cabal-install/cabal-install.cabal | 1 +
cabal-install/cabal-install.cabal.pp | 1 +
12 files changed, 12 insertions(+), 11 deletions(-)
rename {Cabal/Distribution/Types => cabal-install/Distribution/Client}/PackageVersionConstraint.hs (93%)
diff --git a/Cabal/Cabal.cabal b/Cabal/Cabal.cabal
index 6d95efd291..a90b2022f0 100644
--- a/Cabal/Cabal.cabal
+++ b/Cabal/Cabal.cabal
@@ -393,7 +393,6 @@ library
Distribution.Types.VersionRange
Distribution.Types.VersionInterval
Distribution.Types.GivenComponent
- Distribution.Types.PackageVersionConstraint
Distribution.Utils.Generic
Distribution.Utils.NubList
Distribution.Utils.ShortText
diff --git a/cabal-install/Distribution/Client/Configure.hs b/cabal-install/Distribution/Client/Configure.hs
index abafce7ac4..2d9726fb91 100644
--- a/cabal-install/Distribution/Client/Configure.hs
+++ b/cabal-install/Distribution/Client/Configure.hs
@@ -66,7 +66,7 @@ import Distribution.Types.Dependency
( thisPackageVersion )
import Distribution.Types.GivenComponent
( GivenComponent(..) )
-import Distribution.Types.PackageVersionConstraint
+import Distribution.Client.PackageVersionConstraint
( PackageVersionConstraint(..) )
import qualified Distribution.PackageDescription as PkgDesc
import Distribution.PackageDescription.Parsec
diff --git a/cabal-install/Distribution/Client/Install.hs b/cabal-install/Distribution/Client/Install.hs
index df2c7bb4b7..dfaa7624c9 100644
--- a/cabal-install/Distribution/Client/Install.hs
+++ b/cabal-install/Distribution/Client/Install.hs
@@ -146,7 +146,7 @@ import Distribution.Types.Dependency
( thisPackageVersion )
import Distribution.Types.GivenComponent
( GivenComponent(..) )
-import Distribution.Types.PackageVersionConstraint
+import Distribution.Client.PackageVersionConstraint
( PackageVersionConstraint(..) )
import Distribution.Types.MungedPackageId
import qualified Distribution.PackageDescription as PackageDescription
diff --git a/Cabal/Distribution/Types/PackageVersionConstraint.hs b/cabal-install/Distribution/Client/PackageVersionConstraint.hs
similarity index 93%
rename from Cabal/Distribution/Types/PackageVersionConstraint.hs
rename to cabal-install/Distribution/Client/PackageVersionConstraint.hs
index db93ba77f3..9733e6a015 100644
--- a/Cabal/Distribution/Types/PackageVersionConstraint.hs
+++ b/cabal-install/Distribution/Client/PackageVersionConstraint.hs
@@ -1,10 +1,10 @@
{-# LANGUAGE DeriveDataTypeable #-}
{-# LANGUAGE DeriveGeneric #-}
-module Distribution.Types.PackageVersionConstraint
+module Distribution.Client.PackageVersionConstraint
( PackageVersionConstraint(..)
) where
-import Distribution.Compat.Prelude
+import Distribution.Client.Compat.Prelude
import Prelude ()
import Distribution.Parsec
diff --git a/cabal-install/Distribution/Client/ProjectConfig.hs b/cabal-install/Distribution/Client/ProjectConfig.hs
index a8b17131f4..906aaf60c0 100644
--- a/cabal-install/Distribution/Client/ProjectConfig.hs
+++ b/cabal-install/Distribution/Client/ProjectConfig.hs
@@ -83,7 +83,7 @@ import Distribution.Solver.Types.PackageConstraint
import Distribution.Package
( PackageName, PackageId, packageId, UnitId )
-import Distribution.Types.PackageVersionConstraint
+import Distribution.Client.PackageVersionConstraint
( PackageVersionConstraint(..) )
import Distribution.System
( Platform )
diff --git a/cabal-install/Distribution/Client/ProjectConfig/Legacy.hs b/cabal-install/Distribution/Client/ProjectConfig/Legacy.hs
index 2a373a5e8e..eae2587d44 100644
--- a/cabal-install/Distribution/Client/ProjectConfig/Legacy.hs
+++ b/cabal-install/Distribution/Client/ProjectConfig/Legacy.hs
@@ -83,7 +83,7 @@ import Distribution.Client.ParseUtils
import Distribution.Simple.Command
( CommandUI(commandOptions), ShowOrParseArgs(..)
, OptionField, option, reqArg' )
-import Distribution.Types.PackageVersionConstraint
+import Distribution.Client.PackageVersionConstraint
( PackageVersionConstraint )
import qualified Data.Map as Map
diff --git a/cabal-install/Distribution/Client/ProjectConfig/Types.hs b/cabal-install/Distribution/Client/ProjectConfig/Types.hs
index 3a17786d95..5a9a361a47 100644
--- a/cabal-install/Distribution/Client/ProjectConfig/Types.hs
+++ b/cabal-install/Distribution/Client/ProjectConfig/Types.hs
@@ -38,7 +38,7 @@ import Distribution.Solver.Types.ConstraintSource
import Distribution.Package
( PackageName, PackageId, UnitId )
-import Distribution.Types.PackageVersionConstraint
+import Distribution.Client.PackageVersionConstraint
( PackageVersionConstraint )
import Distribution.Version
( Version )
diff --git a/cabal-install/Distribution/Client/ProjectPlanning.hs b/cabal-install/Distribution/Client/ProjectPlanning.hs
index c0392568a9..f201fda940 100644
--- a/cabal-install/Distribution/Client/ProjectPlanning.hs
+++ b/cabal-install/Distribution/Client/ProjectPlanning.hs
@@ -115,7 +115,7 @@ import Distribution.Types.ComponentName
import Distribution.Types.LibraryName
import Distribution.Types.GivenComponent
(GivenComponent(..))
-import Distribution.Types.PackageVersionConstraint
+import Distribution.Client.PackageVersionConstraint
import Distribution.Types.PkgconfigDependency
import Distribution.Types.UnqualComponentName
import Distribution.System
diff --git a/cabal-install/Distribution/Client/Setup.hs b/cabal-install/Distribution/Client/Setup.hs
index fa4adee047..d83016a6fc 100644
--- a/cabal-install/Distribution/Client/Setup.hs
+++ b/cabal-install/Distribution/Client/Setup.hs
@@ -119,7 +119,7 @@ import Distribution.Package
import Distribution.Types.Dependency
import Distribution.Types.GivenComponent
( GivenComponent(..) )
-import Distribution.Types.PackageVersionConstraint
+import Distribution.Client.PackageVersionConstraint
( PackageVersionConstraint(..) )
import Distribution.Types.UnqualComponentName
( unqualComponentNameToPackageName )
diff --git a/cabal-install/Distribution/Deprecated/Text.hs b/cabal-install/Distribution/Deprecated/Text.hs
index a93521ddd8..95a17f8df8 100644
--- a/cabal-install/Distribution/Deprecated/Text.hs
+++ b/cabal-install/Distribution/Deprecated/Text.hs
@@ -46,7 +46,7 @@ import qualified Distribution.Simple.Setup as D
import qualified Distribution.System as D
import qualified Distribution.Types.MungedPackageId as D
import qualified Distribution.Types.MungedPackageName as D
-import qualified Distribution.Types.PackageVersionConstraint as D
+import qualified Distribution.Client.PackageVersionConstraint as D
import qualified Distribution.Types.SourceRepo as D
import qualified Distribution.Types.UnqualComponentName as D
import qualified Distribution.Version as D
diff --git a/cabal-install/cabal-install.cabal b/cabal-install/cabal-install.cabal
index 19bff1a764..5e78a0f685 100644
--- a/cabal-install/cabal-install.cabal
+++ b/cabal-install/cabal-install.cabal
@@ -213,6 +213,7 @@ executable cabal
Distribution.Client.Outdated
Distribution.Client.PackageHash
Distribution.Client.PackageUtils
+ Distribution.Client.PackageVersionConstraint
Distribution.Client.ParseUtils
Distribution.Client.ProjectBuilding
Distribution.Client.ProjectBuilding.Types
diff --git a/cabal-install/cabal-install.cabal.pp b/cabal-install/cabal-install.cabal.pp
index b0f64c2464..b5312dd0d0 100644
--- a/cabal-install/cabal-install.cabal.pp
+++ b/cabal-install/cabal-install.cabal.pp
@@ -138,6 +138,7 @@ Version: 2.5.0.0
Distribution.Client.Outdated
Distribution.Client.PackageHash
Distribution.Client.PackageUtils
+ Distribution.Client.PackageVersionConstraint
Distribution.Client.ParseUtils
Distribution.Client.ProjectBuilding
Distribution.Client.ProjectBuilding.Types
--
GitLab