Repository : ssh://darcs.haskell.org//srv/darcs/packages/haskeline On branch : master
http://hackage.haskell.org/trac/ghc/changeset/2afa99fd4c01cc144865acd7426216e2fe54b00f >--------------------------------------------------------------- commit 2afa99fd4c01cc144865acd7426216e2fe54b00f Author: Judah Jacobson <[email protected]> Date: Sat Apr 28 20:24:59 2012 +0000 Fix Windows build from previous patch (Term refactor). >--------------------------------------------------------------- System/Console/Haskeline/Backend/Win32.hsc | 4 ++-- haskeline.cabal | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/System/Console/Haskeline/Backend/Win32.hsc b/System/Console/Haskeline/Backend/Win32.hsc index dc003d8..e3663c8 100644 --- a/System/Console/Haskeline/Backend/Win32.hsc +++ b/System/Console/Haskeline/Backend/Win32.hsc @@ -361,8 +361,8 @@ win32Term = do , withGetEvent = withWindowMode hs . win32WithEvent hs ch , saveUnusedKeys = saveKeys ch - , runTerm = \(RunTermType f) -> - runReaderT' hs $ runDraw f + , evalTerm = EvalTerm (runReaderT' hs . runDraw) + (Draw . lift) }, closeTerm = closeHandles hs } diff --git a/haskeline.cabal b/haskeline.cabal index 244bef9..4a1dfc4 100644 --- a/haskeline.cabal +++ b/haskeline.cabal @@ -91,6 +91,8 @@ Library if impl(ghc>=7.4) { cpp-options: -DUSE_GHC_ENCODINGS + } else { + Build-depends: utf8-string==0.3.* && >=0.3.6 } if os(windows) { Build-depends: Win32>=2.0 @@ -100,9 +102,8 @@ Library install-includes: win_console.h cpp-options: -DMINGW } else { - Build-depends: unix>=2.0 && < 2.6, + Build-depends: unix>=2.0 && < 2.6 -- unix-2.3 doesn't build on ghc-6.8.1 or earlier - utf8-string==0.3.* && >=0.3.6 c-sources: cbits/h_iconv.c includes: h_iconv.h install-includes: h_iconv.h _______________________________________________ Cvs-libraries mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-libraries
