Edward Z. Yang ezyang at MIT.EDU
Thu Sep 5 00:54:19 UTC 2013

Hey Judah,

We're gearing up for another GHC release, and there a small number of
patches which are still in GHC's tree which have not made it into
the upstream haskeline repository:

commit 495b00b4f125c0b4e7f1e966cd961eae89cffdc0
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sat Aug 31 10:31:52 2013 +0200

    Avoid shadowing `handlers` variable in `catches`

commit 40bcd6ac30577d1d240166674d1e328ac52c1fd5
Author: Ian Lynagh <ian at well-typed.com>
Date:   Tue Jul 2 16:46:53 2013 +0100

    Fix build on Win64

commit 3a92ddd63d4edc622ad4af044c5b664aa64c3dd4
Author: Ian Lynagh <ian at well-typed.com>
Date:   Sun Feb 17 20:25:10 2013 +0000

    Follow unix's version bump

Additionally, I have one more patch for the Windows build, attached below:

commit 80f2fafe39cbc86205afb2eac8d4f60a1ce2684e
Author: Edward Z. Yang <ezyang at mit.edu>
Date:   Wed Sep 4 17:45:37 2013 -0700

    Avoid Handler identifier conflict in Windows.
    Signed-off-by: Edward Z. Yang <ezyang at mit.edu>

diff --git a/System/Console/Haskeline/Backend/Win32.hsc b/System/Console/Haskeline/Backend/Win32.hsc
index d54df2c..4447519 100644
--- a/System/Console/Haskeline/Backend/Win32.hsc
+++ b/System/Console/Haskeline/Backend/Win32.hsc
@@ -17,7 +17,7 @@ import Data.Maybe(mapMaybe)
 import Control.Monad
 import System.Console.Haskeline.Key
-import System.Console.Haskeline.Monads
+import System.Console.Haskeline.Monads hiding (Handler)
 import System.Console.Haskeline.LineState
 import System.Console.Haskeline.Term
 import System.Console.Haskeline.Backend.WCWidth


More information about the ghc-devs mailing list