0f86748 · Idris-dev · git.iko.soy

git.iko.soy/Idris-dev

Fix build errors with GHC 7.10.1. Fixes #2080

commit0f86748e506f5da568423f363389554016235774 authorJan Stolarek <jan.stolarek@p.lodz.pl> dateTue 31 Mar 2015, 15:15 (12 years ago) parent5c8c1d3

7 files changed+14−4

compare with master

unifiedsplit

idris.cabal+2−2 src/Idris/AbsSyntaxTree.hs+2 src/Idris/Delaborate.hs+2 src/Idris/Docs.hs+2 src/Idris/Docstrings.hs+2 src/Idris/Output.hs+3−1 src/Idris/REPL.hs+1−1

idris.cabal+2−2

@@ -817,10 +817,10 @@ Library

817817 , containers >= 0.5 && < 0.6

818818 , deepseq < 1.5

819819 , directory >= 1.2 && < 1.3

820− , filepath < 1.4

820+ , filepath < 1.5

821821 , fingertree >= 0.1 && < 0.2

822822 , haskeline >= 0.7 && < 0.8

823− , lens >= 4.1.1 && < 4.8

823+ , lens >= 4.1.1 && < 4.9

824824 , mtl >= 2.1 && < 2.3

825825 , network < 2.7

826826 , optparse-applicative >= 0.11 && < 0.12

src/Idris/AbsSyntaxTree.hs+2

@@ -18,6 +18,8 @@ import Idris.Colours

1818import System.Console.Haskeline

1919import System.IO

2020

21+import Prelude hiding ((<$>))

22+

2123import Control.Applicative ((<|>))

2224

2325import Control.Monad.Trans.State.Strict

src/Idris/Delaborate.hs+2

@@ -13,6 +13,8 @@ import Idris.Core.Evaluate

1313import Idris.Docstrings (overview, renderDocstring, renderDocTerm)

1414import Idris.ErrReverse

1515

16+import Prelude hiding ((<$>))

17+

1618import Data.List (intersperse, nub)

1719import qualified Data.Text as T

1820import Control.Monad.State

src/Idris/Docs.hs+2

@@ -11,6 +11,8 @@ import Idris.Docstrings (Docstring, emptyDocstring, noDocs, nullDocstring, rende

1111

1212import Util.Pretty

1313

14+import Prelude hiding ((<$>))

15+

1416import Control.Arrow (first)

1517

1618import Data.Maybe

src/Idris/Docstrings.hs+2

@@ -15,6 +15,8 @@ import Util.Pretty

1515

1616import Idris.Core.TT (OutputAnnotation(..), TextFormatting(..), Name, Term, Err)

1717

18+import Prelude hiding ((<$>))

19+

1820import qualified Data.Text as T

1921import qualified Data.Foldable as F

2022import Data.Foldable (Foldable)

src/Idris/Output.hs+3−1

@@ -15,10 +15,12 @@ import Util.ScreenSize (getScreenWidth)

1515

1616import Control.Monad.Trans.Except (ExceptT (ExceptT), runExceptT)

1717

18−import System.Console.Haskeline.MonadException

18+import System.Console.Haskeline.MonadException

1919 (MonadException (controlIO), RunIO (RunIO))

2020import System.IO (stdout, Handle, hPutStrLn)

2121

22+import Prelude hiding ((<$>))

23+

2224import Data.Char (isAlpha)

2325import Data.List (nub, intersperse)

2426import Data.Maybe (fromMaybe)

src/Idris/REPL.hs+1−1

@@ -59,7 +59,7 @@ import IRTS.System

5959

6060import Control.Category

6161import qualified Control.Exception as X

62−import Prelude hiding ((.), id)

62+import Prelude hiding ((<$>), (.), id)

6363import Data.List.Split (splitOn)

6464import Data.List (groupBy)

6565import qualified Data.Text as T