Repository : ssh://darcs.haskell.org//srv/darcs/packages/Cabal On branch : master
http://hackage.haskell.org/trac/ghc/changeset/1816731f57aadf28811bc8c1c7f0ea0ab50a2b84 >--------------------------------------------------------------- commit 1816731f57aadf28811bc8c1c7f0ea0ab50a2b84 Author: Duncan Coutts <[email protected]> Date: Mon Mar 3 21:39:31 2008 +0000 Update for recent Cabal lib api and behaviour changes Depend on latest Cabal lib version and bump our own version due to recent feature additions and removal of the 'info' command. >--------------------------------------------------------------- cabal-install/Hackage/Dependency.hs | 5 +++-- cabal-install/Hackage/List.hs | 5 ++--- cabal-install/cabal-install.cabal | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cabal-install/Hackage/Dependency.hs b/cabal-install/Hackage/Dependency.hs index 987e7fb..426c790 100644 --- a/cabal-install/Hackage/Dependency.hs +++ b/cabal-install/Hackage/Dependency.hs @@ -39,7 +39,8 @@ import Control.Monad (mplus) import Data.List (maximumBy) import Data.Maybe (fromMaybe, catMaybes) import Data.Monoid (Monoid(mappend)) -import qualified System.Info (arch,os) +import qualified System.Info (arch) +import qualified Distribution.System (os) --TODO: never expose the [ResolvedDependency], always gust make a DepGraph @@ -117,7 +118,7 @@ getDependencies comp installed available pkg flags flatten = PackageIndex.fromList . map packageId . PackageIndex.allPackages in Just (flatten available `mappend` flatten installed)) - System.Info.os + Distribution.System.os System.Info.arch (showCompilerId comp, compilerVersion comp) pkg diff --git a/cabal-install/Hackage/List.hs b/cabal-install/Hackage/List.hs index 43da5a6..06d7900 100644 --- a/cabal-install/Hackage/List.hs +++ b/cabal-install/Hackage/List.hs @@ -35,7 +35,7 @@ import Hackage.Types (PkgInfo(..), Repo) import Distribution.Simple.Configure (getInstalledPackages) import Distribution.Simple.Compiler (Compiler,PackageDB) import Distribution.Simple.Program (ProgramConfiguration) -import Distribution.Simple.Utils (equating, comparing, notice, intercalate) +import Distribution.Simple.Utils (equating, comparing, notice) import Distribution.Simple.Setup (fromFlag) -- |Show information about packages @@ -70,8 +70,7 @@ list verbosity packageDB repos comp conf listFlags pats = do else if null matches then notice verbosity "No mathes found." - else notice verbosity $ - intercalate "\n" (map showPackageInfo matches) + else putStr $ unlines (map showPackageInfo matches) where installedFilter | onlyInstalled = filter (not . null . installedVersions) diff --git a/cabal-install/cabal-install.cabal b/cabal-install/cabal-install.cabal index 636bbdf..7ee210a 100644 --- a/cabal-install/cabal-install.cabal +++ b/cabal-install/cabal-install.cabal @@ -1,5 +1,5 @@ Name: cabal-install -Version: 0.4.3 +Version: 0.4.4 Synopsis: Automatic package handling for Haskell Description: apt-get like tool for Haskell. The \'cabal\' command-line program @@ -51,7 +51,7 @@ Executable cabal Hackage.Upload Hackage.Utils - build-depends: Cabal >= 1.3.6, filepath >= 1.0, network, + build-depends: Cabal >= 1.3.7, filepath >= 1.0, network, zlib >= 0.3, HTTP >= 3000.0 && < 3001.1 if flag(old-base) _______________________________________________ Cvs-libraries mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-libraries
