Updates to support base-4.7 from GHC 7.7-2013116

Network/CGI/Monad.hs

@@ -1,3 +1,7 @@
+#if MIN_VERSION_base(4,7,0)
+{-# LANGUAGE DeriveDataTypeable #-}
+#endif
+
 {-# OPTIONS_GHC -fglasgow-exts #-}
 -----------------------------------------------------------------------------
 -- |
@@ -40,8 +44,13 @@ import Control.Monad.Error (MonadError(..))
 import Control.Monad.Reader (ReaderT(..), asks)
 import Control.Monad.Writer (WriterT(..), tell)
 import Control.Monad.Trans (MonadTrans, MonadIO, liftIO, lift)
+
+#if MIN_VERSION_base(4,7,0)
+import Data.Typeable (Typeable())
+#else
 import Data.Typeable (Typeable(..), Typeable1(..), 
                       mkTyConApp, mkTyCon)
+#endif
 
 import Network.CGI.Protocol
 
@@ -55,10 +64,13 @@ type CGI a = CGIT IO a
 
 -- | The CGIT monad transformer.
 newtype CGIT m a = CGIT { unCGIT :: ReaderT CGIRequest (WriterT Headers m) a }
-
+#if MIN_VERSION_base(4,7,0)
+     deriving (Typeable)
+#else
 instance (Typeable1 m, Typeable a) => Typeable (CGIT m a) where
     typeOf _ = mkTyConApp (mkTyCon "Network.CGI.Monad.CGIT") 
                 [typeOf1 (undefined :: m a), typeOf (undefined :: a)]
+#endif
 
 instance (Functor m, Monad m) => Functor (CGIT m) where
     fmap f c = CGIT (fmap f (unCGIT c))
@@ -119,7 +131,7 @@ catchCGI = catch
 
 -- | Catches any exception thrown by an CGI action, and returns either
 --   the exception, or if no exception was raised, the result of the action.
-tryCGI :: (MonadCGI m, MonadCatchIO m) => m a -> m (Either SomeException a)
+tryCGI :: (MonadCGI m, MonadCatchIO m, Functor m) => m a -> m (Either SomeException a)
 tryCGI = try
 
 {-# DEPRECATED handleExceptionCGI "Use catchCGI instead." #-}

Network/CGI/Protocol.hs

@@ -1,3 +1,8 @@
+{-# LANGUAGE CPP #-}
+#if MIN_VERSION_base(4,7,0)
+{-# LANGUAGE DeriveDataTypeable #-}
+#endif
+
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Network.CGI.Protocol
@@ -44,7 +49,11 @@ import System.IO (Handle, hPutStrLn, stderr, hFlush, hSetBinaryMode)
 import qualified Data.ByteString.Lazy.Char8 as BS
 import Data.ByteString.Lazy.Char8 (ByteString)
 
+#if MIN_VERSION_base(4,7,0)
+import Data.Typeable (Typeable())
+#else
 import Data.Typeable (Typeable(..), mkTyConApp, mkTyCon)
+#endif
 
 import Network.CGI.Header
 import Network.CGI.Multipart
@@ -70,11 +79,14 @@ data CGIRequest =
                 -- "multipart\/form-data" format.
                 cgiRequestBody :: ByteString
                }
+#if MIN_VERSION_base(4,7,0)
+    deriving (Show, Typeable)
+#else
     deriving (Show)
 
 instance Typeable CGIResult where
     typeOf _ = mkTyConApp (mkTyCon "Network.CGI.Protocol.CGIResult") []
-
+#endif
 -- | The value of an input parameter, and some metadata.
 data Input = Input {
                     inputValue :: ByteString,

cgi.cabal

@@ -38,7 +38,7 @@ Library
     network >= 2.0,
     parsec >= 2.0,
     mtl >= 1.0,
-    MonadCatchIO-mtl,
+    MonadCatchIO-transformers,
     xhtml >= 3000.0.0
   If flag(split-base)
     Build-depends: base >= 3 && < 5, old-time, old-locale, containers