[commit: packages/time] format-widths, improve-leapseconds, master, posix-perf, tasty, wip/travis: Follow Cabal changes in Setup.*hs (fae8a55)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/time

On branches: format-widths,improve-leapseconds,master,posix-perf,tasty,wip/travis
Link       : http://git.haskell.org/packages/time.git/commitdiff/fae8a5587481b1ae3da17c49d04cc0ab89ed8ca6

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

commit fae8a5587481b1ae3da17c49d04cc0ab89ed8ca6
Author: Ian Lynagh <igloo at earth.li>
Date:   Wed Apr 18 05:14:32 2007 -0700

    Follow Cabal changes in Setup.*hs
    
    darcs-hash:20070418121432-3fd76-50d82afe568d115252a1a061ee8e8cb581e2bebc


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

fae8a5587481b1ae3da17c49d04cc0ab89ed8ca6
 Setup.hs | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/Setup.hs b/Setup.hs
index f078742..caecfdd 100644
--- a/Setup.hs
+++ b/Setup.hs
@@ -9,7 +9,6 @@ import Distribution.Simple.LocalBuildInfo
 import System.Cmd
 import System.Directory
 import System.Environment
-import System.Exit
 import System.Info
 
 main :: IO ()
@@ -31,7 +30,7 @@ withCurrentDirectory path f = do
     finally f (setCurrentDirectory cur)
 
 runTestScript :: Args -> Bool -> PackageDescription -> LocalBuildInfo
-              -> IO ExitCode
+              -> IO ()
 runTestScript _args _flag _pd _lbi
  = withCurrentDirectory "test" (system "make")
 
@@ -60,11 +59,10 @@ removePrefix (x:xs) (y:ys)
  | x == y = removePrefix xs ys
  | otherwise = Nothing
 
-type Hook a = PackageDescription -> LocalBuildInfo -> Maybe UserHooks -> a
-           -> IO ()
+type Hook a = PackageDescription -> LocalBuildInfo -> UserHooks -> a -> IO ()
 
 add_ghc_options :: [String] -> Hook a -> Hook a
-add_ghc_options args f pd lbi muhs x
+add_ghc_options args f pd lbi uhs x
  = do let lib' = case library pd of
                      Just lib ->
                          let bi = libBuildInfo lib
@@ -73,7 +71,7 @@ add_ghc_options args f pd lbi muhs x
                          in lib { libBuildInfo = bi' }
                      Nothing -> error "Expected a library"
           pd' = pd { library = Just lib' }
-      f pd' lbi muhs x
+      f pd' lbi uhs x
 
 type ConfHook = PackageDescription -> ConfigFlags -> IO LocalBuildInfo