Add notion of ExeDependency for tool-depends and custom setup

Cabal/Distribution/Package.hs

@@ -44,6 +44,7 @@ module Distribution.Package (
 
  -- * Package source dependencies
  Dependency(..),
+ ExeDependency(..),
  LegacyExeDependency(..),
  PkgconfigDependency(..),
  thisPackageVersion,
@@ -395,12 +396,20 @@ mkLegacyUnitId = newSimpleUnitId . mkComponentId . display
 data Dependency = Dependency PackageName VersionRange
  deriving (Generic, Read, Show, Eq, Typeable, Data)
 
+-- | Describes a dependency on an executable from a package
+--
+data ExeDependency = ExeDependency
+ PackageName
+ UnqualComponentName -- name of executable component of package
+ VersionRange
+ deriving (Generic, Read, Show, Eq, Typeable, Data)
+
 -- | Describes a legacy `build-tools`-style dependency on an executable
 --
 -- It is "legacy" because we do not know what the build-tool referred to. It
 -- could refer to a pkg-config executable (PkgconfigName), or an internal
 -- executable (UnqualComponentName). Thus the name is stringly typed.
---
+--g
 -- @since 2.0
 data LegacyExeDependency = LegacyExeDependency
  String
@@ -416,10 +425,12 @@ data PkgconfigDependency = PkgconfigDependency
  deriving (Generic, Read, Show, Eq, Typeable, Data)
 
 instance Binary Dependency
+instance Binary ExeDependency
 instance Binary LegacyExeDependency
 instance Binary PkgconfigDependency
 
 instance NFData Dependency where rnf = genericRnf
+instance NFData ExeDependency where rnf = genericRnf
 instance NFData LegacyExeDependency where rnf = genericRnf
 instance NFData PkgconfigDependency where rnf = genericRnf
 

Cabal/Distribution/Package/TextClass.hs

@@ -27,6 +27,18 @@ instance Text Dependency where
  Parse.skipSpaces
  return (Dependency name ver)
 
+instance Text ExeDependency where
+ disp (ExeDependency name exe ver) =
+ (disp name <<>> Disp.text ":" <<>> disp exe) <+> disp ver
+
+ parse = do name <- parse
+ _ <- Parse.char ':'
+ exe <- parse
+ Parse.skipSpaces
+ ver <- parse <++ return anyVersion
+ Parse.skipSpaces
+ return (ExeDependency name exe ver)
+
 instance Text LegacyExeDependency where
  disp (LegacyExeDependency name ver) =
  Disp.text name <+> disp ver

Cabal/Distribution/Parsec/Class.hs

@@ -32,7 +32,7 @@ import Distribution.License (License (..))
 import Distribution.ModuleName (ModuleName)
 import qualified Distribution.ModuleName as ModuleName
 import Distribution.Package
- (Dependency (..),
+ (Dependency (..), ExeDependency (..),
  LegacyExeDependency (..), PkgconfigDependency (..),
  UnqualComponentName, mkUnqualComponentName,
  PackageName, mkPackageName,
@@ -133,6 +133,14 @@ instance Parsec Dependency where
  ver <- parsec <|> pure anyVersion
  return (Dependency name ver)
 
+instance Parsec ExeDependency where
+ parsec = do
+ name <- lexemeParsec
+ _ <- P.char ':'
+ exe <- lexemeParsec
+ ver <- parsec <|> pure anyVersion
+ return (ExeDependency name exe ver)
+
 instance Parsec LegacyExeDependency where
  parsec = do
  name <- parsecMaybeQuoted nameP