fixed name collision in Setup.lhs

ekmett · Jan 19, 2011 · 3d0d9ed · 3d0d9ed
1 parent d1af2c3
commit 3d0d9ed
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/CHANGELOG.markdown b/CHANGELOG.markdown
@@ -1,3 +1,6 @@
+/1.2.0.2/
+ * Fixed name collision with the new Distribution.Simple.testHook in Setup.lhs
+
 /1.2.0.1/
  * Weakened dependencies
 

diff --git a/Setup.lhs b/Setup.lhs
@@ -30,7 +30,7 @@ main :: IO ()
 main = defaultMainWithHooks hooks
 
 hooks :: UserHooks
-hooks = simpleUserHooks { runTests = testHook } 
+hooks = simpleUserHooks { runTests = runMyTests } 
 
 findHPC :: LocalBuildInfo -> IO FilePath
 findHPC lbi = do
@@ -48,8 +48,8 @@ testSpeculation dflt f pd =
                | exe <- executables pd
                , exeName exe == "test-speculation" ]
 
-testHook :: Args -> Bool -> PackageDescription -> LocalBuildInfo -> IO ()
+runMyTests :: Args -> Bool -> PackageDescription -> LocalBuildInfo -> IO ()
-testHook args0 _unknown pd lbi = do
+runMyTests args0 _unknown pd lbi = do
     let args = if null args0 then [] else "-t" : args0
     -- dir <- getWorkingDirectory
     let testDir = buildDir lbi </> "test-speculation"

diff --git a/speculation.cabal b/speculation.cabal
@@ -1,5 +1,5 @@
 name:           speculation
-version:        1.2.0.1
+version:        1.2.0.2
 license:        BSD3
 license-file:   LICENSE
 author:         Edward A. Kmett