Repository : ssh://darcs.haskell.org//srv/darcs/packages/Cabal On branch : master
http://hackage.haskell.org/trac/ghc/changeset/28d36a4e39ccc68572a5abeb3a949c41bc7d1bb0 >--------------------------------------------------------------- commit 28d36a4e39ccc68572a5abeb3a949c41bc7d1bb0 Author: Duncan Coutts <[email protected]> Date: Mon Jun 16 17:32:53 2008 +0000 Use standard thisPackageVersion rather than inlined definition >--------------------------------------------------------------- cabal-install/Hackage/Install.hs | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/cabal-install/Hackage/Install.hs b/cabal-install/Hackage/Install.hs index 969ab19..6e9dc65 100644 --- a/cabal-install/Hackage/Install.hs +++ b/cabal-install/Hackage/Install.hs @@ -60,7 +60,7 @@ import Distribution.Simple.Setup import Distribution.Simple.Utils ( defaultPackageDesc, inDir, rawSystemExit, withTempDirectory ) import Distribution.Package - ( PackageIdentifier(..), Package(..), Dependency(..) ) + ( PackageIdentifier(..), Package(..), thisPackageVersion ) import Distribution.PackageDescription as PackageDescription ( GenericPackageDescription(packageDescription) , readPackageDescription ) @@ -184,8 +184,7 @@ planLocalPackage verbosity comp configFlags installed available = do packageSource = LocalUnpackedPackage } localPkgDep = UnresolvedDependency { - dependency = let PackageIdentifier n v = packageId localPkg - in Dependency n (ThisVersion v), + dependency = thisPackageVersion (packageId localPkg), depFlags = Cabal.configConfigurationsFlags configFlags } @@ -278,8 +277,7 @@ installConfiguredPackage :: Cabal.ConfigFlags -> ConfiguredPackage installConfiguredPackage configFlags (ConfiguredPackage pkg flags deps) installPkg = installPkg configFlags { Cabal.configConfigurationsFlags = flags, - Cabal.configConstraints = [ Dependency name (ThisVersion version) - | PackageIdentifier name version <- deps ] + Cabal.configConstraints = map thisPackageVersion deps } pkg installAvailablePackage _______________________________________________ Cvs-libraries mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-libraries
