From 0f86748e506f5da568423f363389554016235774 Mon Sep 17 00:00:00 2001
From: Jan Stolarek <jan.stolarek@p.lodz.pl>
Date: Tue, 31 Mar 2015 15:15:56 +0200
Subject: [PATCH] Fix build errors with GHC 7.10.1. Fixes #2080

---
 idris.cabal                | 4 ++--
 src/Idris/AbsSyntaxTree.hs | 2 ++
 src/Idris/Delaborate.hs    | 2 ++
 src/Idris/Docs.hs          | 2 ++
 src/Idris/Docstrings.hs    | 2 ++
 src/Idris/Output.hs        | 4 +++-
 src/Idris/REPL.hs          | 2 +-
 7 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/idris.cabal b/idris.cabal
index 12a687106..e4a5efdce 100644
--- a/idris.cabal
+++ b/idris.cabal
@@ -817,10 +817,10 @@ Library
                 , containers >= 0.5 && < 0.6
                 , deepseq < 1.5
                 , directory >= 1.2 && < 1.3
-                , filepath < 1.4
+                , filepath < 1.5
                 , fingertree >= 0.1 && < 0.2
                 , haskeline >= 0.7 && < 0.8
-                , lens >= 4.1.1 && < 4.8
+                , lens >= 4.1.1 && < 4.9
                 , mtl >= 2.1 && < 2.3
                 , network < 2.7
                 , optparse-applicative >= 0.11 && < 0.12
diff --git a/src/Idris/AbsSyntaxTree.hs b/src/Idris/AbsSyntaxTree.hs
index 854c95b99..8d6f4717f 100644
--- a/src/Idris/AbsSyntaxTree.hs
+++ b/src/Idris/AbsSyntaxTree.hs
@@ -18,6 +18,8 @@ import Idris.Colours
 import System.Console.Haskeline
 import System.IO
 
+import Prelude hiding ((<$>))
+
 import Control.Applicative ((<|>))
 
 import Control.Monad.Trans.State.Strict
diff --git a/src/Idris/Delaborate.hs b/src/Idris/Delaborate.hs
index 051f4d54f..d8c957031 100644
--- a/src/Idris/Delaborate.hs
+++ b/src/Idris/Delaborate.hs
@@ -13,6 +13,8 @@ import Idris.Core.Evaluate
 import Idris.Docstrings (overview, renderDocstring, renderDocTerm)
 import Idris.ErrReverse
 
+import Prelude hiding ((<$>))
+
 import Data.List (intersperse, nub)
 import qualified Data.Text as T
 import Control.Monad.State
diff --git a/src/Idris/Docs.hs b/src/Idris/Docs.hs
index 23dbad4b3..b233f8eec 100644
--- a/src/Idris/Docs.hs
+++ b/src/Idris/Docs.hs
@@ -11,6 +11,8 @@ import Idris.Docstrings (Docstring, emptyDocstring, noDocs, nullDocstring, rende
 
 import Util.Pretty
 
+import Prelude hiding ((<$>))
+
 import Control.Arrow (first)
 
 import Data.Maybe
diff --git a/src/Idris/Docstrings.hs b/src/Idris/Docstrings.hs
index a9e7eedd3..01a8dae78 100644
--- a/src/Idris/Docstrings.hs
+++ b/src/Idris/Docstrings.hs
@@ -15,6 +15,8 @@ import Util.Pretty
 
 import Idris.Core.TT (OutputAnnotation(..), TextFormatting(..), Name, Term, Err)
 
+import Prelude hiding ((<$>))
+
 import qualified Data.Text as T
 import qualified Data.Foldable as F
 import Data.Foldable (Foldable)
diff --git a/src/Idris/Output.hs b/src/Idris/Output.hs
index 689ed477e..f87e6df67 100644
--- a/src/Idris/Output.hs
+++ b/src/Idris/Output.hs
@@ -15,10 +15,12 @@ import Util.ScreenSize (getScreenWidth)
 
 import Control.Monad.Trans.Except (ExceptT (ExceptT), runExceptT)
 
-import System.Console.Haskeline.MonadException 
+import System.Console.Haskeline.MonadException
   (MonadException (controlIO), RunIO (RunIO))
 import System.IO (stdout, Handle, hPutStrLn)
 
+import Prelude hiding ((<$>))
+
 import Data.Char (isAlpha)
 import Data.List (nub, intersperse)
 import Data.Maybe (fromMaybe)
diff --git a/src/Idris/REPL.hs b/src/Idris/REPL.hs
index 7807df593..18dcd3143 100644
--- a/src/Idris/REPL.hs
+++ b/src/Idris/REPL.hs
@@ -59,7 +59,7 @@ import IRTS.System
 
 import Control.Category
 import qualified Control.Exception as X
-import Prelude hiding ((.), id)
+import Prelude hiding ((<$>), (.), id)
 import Data.List.Split (splitOn)
 import Data.List (groupBy)
 import qualified Data.Text as T