[commit: Cabal] master: Build with ghc-6.6 (b9d5ca1)

[Ian Lynagh]

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

On branch  : master

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

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

commit b9d5ca15a75a0a1b6b0398c9d195fd718f3d951f
Author: Duncan Coutts <duncan at haskell.org>
Date:   Tue Nov 10 11:37:35 2009 +0000

    Build with ghc-6.6

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

 cabal-install/Distribution/Client/Init.hs          |   13 ++++++++++++-
 .../Distribution/Client/Init/Heuristics.hs         |    6 ++----
 cabal-install/Distribution/Client/Init/Types.hs    |   11 +++++++++++
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/cabal-install/Distribution/Client/Init.hs b/cabal-install/Distribution/Client/Init.hs
index 1a5c399..274a390 100644
--- a/cabal-install/Distribution/Client/Init.hs
+++ b/cabal-install/Distribution/Client/Init.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Distribution.Client.Init
@@ -34,7 +35,11 @@ import Data.Maybe
 import Data.Traversable
   ( traverse )
 import Control.Monad
-  ( (>=>), when )
+  ( when )
+#if MIN_VERSION_base(3,0,0)
+import Control.Monad
+  ( (>=>) )
+#endif
 
 import Text.PrettyPrint.HughesPJ hiding (mode, cat)
 
@@ -558,3 +563,9 @@ generateWarnings flags = do
 message :: InitFlags -> String -> IO ()
 message (InitFlags{quiet = Flag True}) _ = return ()
 message _ s = putStrLn s
+
+#if MIN_VERSION_base(3,0,0)
+#else
+(>=>)       :: Monad m => (a -> m b) -> (b -> m c) -> (a -> m c)
+f >=> g     = \x -> f x >>= g
+#endif
diff --git a/cabal-install/Distribution/Client/Init/Heuristics.hs b/cabal-install/Distribution/Client/Init/Heuristics.hs
index 0e0fb80..82f4745 100644
--- a/cabal-install/Distribution/Client/Init/Heuristics.hs
+++ b/cabal-install/Distribution/Client/Init/Heuristics.hs
@@ -1,7 +1,4 @@
 {-# LANGUAGE CPP #-}
-{-# OPTIONS_GHC -cpp #-}
-{-# OPTIONS_NHC98 -cpp #-}
-{-# OPTIONS_JHC -fcpp #-}
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Distribution.Client.Init.Heuristics
@@ -28,6 +25,8 @@ import Distribution.Client.PackageIndex
     ( allPackagesByName )
 import qualified Distribution.PackageDescription as PD
     ( category, packageDescription )
+import Distribution.Simple.Utils
+         ( intercalate )
 
 import Distribution.Client.Types ( packageDescription, AvailablePackageDb(..) )
 import Control.Monad (liftM )
@@ -35,7 +34,6 @@ import Data.Char   ( isUpper, isLower, isSpace )
 #if MIN_VERSION_base(3,0,3)
 import Data.Either ( partitionEithers )
 #endif
-import Data.List   ( intercalate )
 import Data.Maybe  ( catMaybes )
 import Data.Monoid ( mempty, mappend )
 import qualified Data.Set as Set ( fromList, toList )
diff --git a/cabal-install/Distribution/Client/Init/Types.hs b/cabal-install/Distribution/Client/Init/Types.hs
index fe5ea27..8496ceb 100644
--- a/cabal-install/Distribution/Client/Init/Types.hs
+++ b/cabal-install/Distribution/Client/Init/Types.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Distribution.Client.Init.Types
@@ -154,3 +155,13 @@ data Stability
 instance Text Stability where
   disp  = Disp.text . show
   parse = Parse.choice $ map (fmap read . Parse.string . show) [Stable .. ]
+
+#if MIN_VERSION_base(3,0,0)
+#else
+-- Compat instance for ghc-6.6 era
+instance Monoid a => Monoid (Maybe a) where
+  mempty = Nothing
+  Nothing `mappend` m = m
+  m `mappend` Nothing = m
+  Just m1 `mappend` Just m2 = Just (m1 `mappend` m2)
+#endif