[commit: Cabal] master: fix compilation with ghc-7.4 (dc17256)

[Ian Lynagh]

Repository : ssh://darcs.haskell.org//srv/darcs/packages/Cabal

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/dc1725686cd338d2e1353639f95205dfba363fc2

>---------------------------------------------------------------

commit dc1725686cd338d2e1353639f95205dfba363fc2
Author: Andres Loeh <andres at well-typed.com>
Date:   Tue Jan 10 20:03:56 2012 +0000

    fix compilation with ghc-7.4
    
    Thanks to Tuncer Ayaz.

>---------------------------------------------------------------

 .../Client/Dependency/Modular/Dependency.hs        |    2 +-
 .../Distribution/Client/Dependency/Modular/Log.hs  |    3 ++-
 cabal-install/cabal-install.cabal                  |   10 +++++-----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/cabal-install/Distribution/Client/Dependency/Modular/Dependency.hs b/cabal-install/Distribution/Client/Dependency/Modular/Dependency.hs
index 78c1d4f..f9ecb89 100644
--- a/cabal-install/Distribution/Client/Dependency/Modular/Dependency.hs
+++ b/cabal-install/Distribution/Client/Dependency/Modular/Dependency.hs
@@ -52,7 +52,7 @@ type VROrigin qpn = (VR, Goal qpn)
 -- | Helper function to collapse a list of version ranges with origins into
 -- a single, simplified, version range.
 collapse :: [VROrigin qpn] -> VR
-collapse = simplifyVR . foldr (.&&.) anyVR . L.map fst
+collapse = simplifyVR . L.foldr (.&&.) anyVR . L.map fst
 
 showCI :: CI QPN -> String
 showCI (Fixed i _)      = "==" ++ showI i
diff --git a/cabal-install/Distribution/Client/Dependency/Modular/Log.hs b/cabal-install/Distribution/Client/Dependency/Modular/Log.hs
index 2cf7dd0..150989d 100644
--- a/cabal-install/Distribution/Client/Dependency/Modular/Log.hs
+++ b/cabal-install/Distribution/Client/Dependency/Modular/Log.hs
@@ -1,6 +1,7 @@
 module Distribution.Client.Dependency.Modular.Log where
 
 import Control.Applicative
+import Data.List as L
 import Data.Set as S
 
 import Distribution.Client.Dependency.Types -- from Cabal
@@ -59,7 +60,7 @@ logToProgress mbj l = let
     -- the entire tree.
     go ms (x : xs) r         s        = Step x (go ms xs r s)
     go ms []       (Just cs) _        = Fail ("Could not resolve dependencies:\n" ++
-                                        unlines (showMessages (foldr (\ v _ -> v `S.member` cs) True) False ms))
+                                        unlines (showMessages (L.foldr (\ v _ -> v `S.member` cs) True) False ms))
     go _  []       _         (Just s) = Done s
     go _  []       _         _        = Fail ("Could not resolve dependencies.") -- should not happen
 
diff --git a/cabal-install/cabal-install.cabal b/cabal-install/cabal-install.cabal
index 1140db0..5d26427 100644
--- a/cabal-install/cabal-install.cabal
+++ b/cabal-install/cabal-install.cabal
@@ -106,12 +106,12 @@ Executable cabal
         Paths_cabal_install
 
     build-depends: base     >= 2        && < 5,
-                   Cabal    >= 1.13.3   && < 1.14,
-                   filepath >= 1.0      && < 1.3,
+                   Cabal    >= 1.13.3   && < 1.15,
+                   filepath >= 1.0      && < 1.4,
                    network  >= 1        && < 3,
                    HTTP     >= 4000.0.2 && < 4001,
                    zlib     >= 0.4      && < 0.6,
-                   time     >= 1.1      && < 1.3,
+                   time     >= 1.1      && < 1.5,
                    mtl      >= 2.0      && < 3
 
     if flag(old-base)
@@ -123,8 +123,8 @@ Executable cabal
                      pretty     >= 1   && < 1.2,
                      random     >= 1   && < 1.1,
                      containers >= 0.1 && < 0.5,
-                     array      >= 0.1 && < 0.4,
-                     old-time   >= 1   && < 1.1
+                     array      >= 0.1 && < 0.5,
+                     old-time   >= 1   && < 1.2
 
     if flag(bytestring-in-base)
       build-depends: base >= 2.0 && < 2.2