Skip to content

Commit

Permalink
Fix import clash in Setup.hs
Browse files Browse the repository at this point in the history
Control.Exception.catch clashes with Prelude.catch on older versions of base.
Newer versions of base don’t have Prelude.catch, so it’s probably not possible
to import Prelude hiding (catch) .
  • Loading branch information
Melvar committed Dec 22, 2013
1 parent 4218126 commit edbb52f
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Setup.hs
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ idrisConfigure _ flags _ local = do
-- Put the Git hash into a module for use in the program
-- For release builds, just put the empty string in the module
generateVersionModule = do
gitHash <- catch (readProcess "git" ["rev-parse", "--short", "HEAD"] "")
gitHash <- Control.Exception.catch (readProcess "git" ["rev-parse", "--short", "HEAD"] "")
(\e -> let e' = (e :: SomeException) in return "PRE")
let hash = takeWhile (/= '\n') gitHash
let versionModulePath = autogenModulesDir local </> "Version_idris" Px.<.> "hs"
Expand Down

0 comments on commit edbb52f

Please sign in to comment.