Repository : ssh://darcs.haskell.org//srv/darcs/packages/Cabal On branch : master
http://hackage.haskell.org/trac/ghc/changeset/44f4b51d979221b75c756e5f3f8b92e158e1c401 >--------------------------------------------------------------- commit 44f4b51d979221b75c756e5f3f8b92e158e1c401 Author: Duncan Coutts <[email protected]> Date: Thu Mar 6 11:48:34 2008 +0000 Use new buildOS and buildArch >--------------------------------------------------------------- cabal-install/Hackage/Dependency.hs | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cabal-install/Hackage/Dependency.hs b/cabal-install/Hackage/Dependency.hs index 8175a23..da072dd 100644 --- a/cabal-install/Hackage/Dependency.hs +++ b/cabal-install/Hackage/Dependency.hs @@ -32,15 +32,15 @@ import Distribution.PackageDescription , GenericPackageDescription ) import Distribution.PackageDescription.Configuration ( finalizePackageDescription) -import Distribution.Simple.Compiler (Compiler, showCompilerId, compilerVersion) +import Distribution.Simple.Compiler + ( Compiler(compilerFlavor), compilerVersion ) import Distribution.Simple.Utils (comparing) import Control.Monad (mplus) import Data.List (maximumBy) import Data.Maybe (fromMaybe, catMaybes) import Data.Monoid (Monoid(mappend)) -import qualified System.Info (arch) -import qualified Distribution.System (os) +import qualified Distribution.System (buildOS, buildArch) --TODO: never expose the [ResolvedDependency], always gust make a DepGraph @@ -134,9 +134,9 @@ getDependencies comp installed available pkg flags flatten = PackageIndex.fromList . map packageId . PackageIndex.allPackages in Just (flatten available `mappend` flatten installed)) - Distribution.System.os - System.Info.arch - (showCompilerId comp, compilerVersion comp) + Distribution.System.buildOS + Distribution.System.buildArch + (compilerFlavor comp, compilerVersion comp) pkg packagesToInstall :: [ResolvedDependency] _______________________________________________ Cvs-libraries mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-libraries
