Commit 3f350ddd authored by Andres Löh's avatar Andres Löh
Browse files

fix compilation with ghc-7.4

Thanks to Tuncer Ayaz.
parent c145a65e
......@@ -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
......
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
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment