From ab0347efaa0e7867866a2ddb00d8729a95cd6d41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Gr=C3=B6ber?= Date: Tue, 16 Sep 2014 06:20:40 +0200 Subject: [PATCH 1/2] monad-journal-0.4 fixes mtl dependency trouble --- ghc-mod.cabal | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ghc-mod.cabal b/ghc-mod.cabal index f4c6901..77401af 100644 --- a/ghc-mod.cabal +++ b/ghc-mod.cabal @@ -104,7 +104,7 @@ Library , ghc-syb-utils , hlint >= 1.8.61 , io-choice - , monad-journal >= 0.2.2.0 && < 0.2.3.2 + , monad-journal >= 0.4 , old-time , process , syb @@ -197,7 +197,7 @@ Test-Suite spec , ghc-syb-utils , hlint >= 1.7.1 , io-choice - , monad-journal >= 0.2.2.0 && < 0.2.3.2 + , monad-journal >= 0.4 , old-time , process , syb From 34dd8c5bd9b81d4d1fec2c3fb3ed68aa3d086969 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Gr=C3=B6ber?= Date: Wed, 17 Sep 2014 23:39:10 +0200 Subject: [PATCH 2/2] Fix error when compiling with HSE < 1.16 --- Language/Haskell/GhcMod/FillSig.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Language/Haskell/GhcMod/FillSig.hs b/Language/Haskell/GhcMod/FillSig.hs index c9487e9..ae7e0ea 100644 --- a/Language/Haskell/GhcMod/FillSig.hs +++ b/Language/Haskell/GhcMod/FillSig.hs @@ -174,7 +174,7 @@ getSignatureFromHE file lineNo colNo = do dHeadTyVars (HE.DHParen _ r) = dHeadTyVars r #else dHeadTyVars :: HE.DeclHead l -> (HE.Name l, [HE.TyVarBind l]) - dHeadTyVars (DHead _ n tys) = (n, tys) + dHeadTyVars (HE.DHead _ n tys) = (n, tys) #endif ----------------------------------------------------------------