[commit: packages/haskeline] master: Bump the lower bound to ghc-8.0. (#94) (9ad673c)
git at git.haskell.org
git at git.haskell.org
Tue Nov 27 20:23:20 UTC 2018
Repository : ssh://git@git.haskell.org/haskeline
On branch : master
Link : http://git.haskell.org/packages/haskeline.git/commitdiff/9ad673ce45ebb8b739eb58b2a118956c65d4ed7c
>---------------------------------------------------------------
commit 9ad673ce45ebb8b739eb58b2a118956c65d4ed7c
Author: Judah Jacobson <judah at users.noreply.github.com>
Date: Sat Oct 6 05:32:49 2018 -0700
Bump the lower bound to ghc-8.0. (#94)
Also:
- Add CI testing up to ghc-8.6.1
- Don't install explicit Cabal versions, now that we don't have
a custom Setup script.
>---------------------------------------------------------------
9ad673ce45ebb8b739eb58b2a118956c65d4ed7c
.travis.yml | 15 ++++-----------
System/Console/Haskeline/Backend/Terminfo.hs | 1 -
System/Console/Haskeline/Backend/Win32.hsc | 3 ---
System/Console/Haskeline/InputT.hs | 2 --
System/Console/Haskeline/MonadException.hs | 3 ---
System/Console/Haskeline/Monads.hs | 9 ++++-----
System/Console/Haskeline/Term.hs | 4 ++--
haskeline.cabal | 6 +++---
8 files changed, 13 insertions(+), 30 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 4c4da28..9bbfc7d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,17 +2,11 @@
#
# NB: don't set `language: haskell` here
env:
- - CABALVER=1.16 GHCVER=7.4.1
- - CABALVER=1.16 GHCVER=7.4.2
- - CABALVER=1.16 GHCVER=7.6.1
- - CABALVER=1.16 GHCVER=7.6.2
- - CABALVER=1.18 GHCVER=7.6.3
- - CABALVER=1.18 GHCVER=7.8.1
- - CABALVER=1.18 GHCVER=7.8.2
- - CABALVER=1.18 GHCVER=7.8.3
- - CABALVER=1.18 GHCVER=7.8.4
- - CABALVER=1.22 GHCVER=7.10.3
- CABALVER=1.24 GHCVER=8.0.1
+ - CABALVER=1.24 GHCVER=8.0.2
+ - CABALVER=2.0 GHCVER=8.2.2
+ - CABALVER=2.2 GHCVER=8.4.3
+ - CABALVER=2.4 GHCVER=8.6.1
# Note: the distinction between `before_install` and `install` is not important.
before_install:
@@ -26,7 +20,6 @@ install:
- echo "$(ghc --version) [$(ghc --print-project-git-commit-id 2> /dev/null || echo '?')]"
- travis_retry cabal update
- cabal install --only-dependencies
- - cabal install "Cabal == $CABALVER.*" # Use the same Cabal version for Setup.hs and cabal-install
# Here starts the actual work to be performed for the package under test; any command which exits with a non-zero exit code causes the build to fail.
script:
diff --git a/System/Console/Haskeline/Backend/Terminfo.hs b/System/Console/Haskeline/Backend/Terminfo.hs
index 20f996c..6a41c53 100644
--- a/System/Console/Haskeline/Backend/Terminfo.hs
+++ b/System/Console/Haskeline/Backend/Terminfo.hs
@@ -5,7 +5,6 @@ module System.Console.Haskeline.Backend.Terminfo(
where
import System.Console.Terminfo
-import Control.Applicative
import Control.Monad
import Data.List(foldl')
import System.IO
diff --git a/System/Console/Haskeline/Backend/Win32.hsc b/System/Console/Haskeline/Backend/Win32.hsc
index bb37a50..7ba41d4 100644
--- a/System/Console/Haskeline/Backend/Win32.hsc
+++ b/System/Console/Haskeline/Backend/Win32.hsc
@@ -166,9 +166,6 @@ getKeyEvent p = do
data Coord = Coord {coordX, coordY :: Int}
deriving Show
-#if __GLASGOW_HASKELL__ < 711
-#let alignment t = "%lu", (unsigned long)offsetof(struct {char x__; t (y__); }, y__)
-#endif
instance Storable Coord where
sizeOf _ = (#size COORD)
alignment _ = (#alignment COORD)
diff --git a/System/Console/Haskeline/InputT.hs b/System/Console/Haskeline/InputT.hs
index 1fcd4cc..e23d35b 100644
--- a/System/Console/Haskeline/InputT.hs
+++ b/System/Console/Haskeline/InputT.hs
@@ -13,8 +13,6 @@ import System.Console.Haskeline.Term
import System.Directory(getHomeDirectory)
import System.FilePath
-import Control.Applicative
-import Control.Monad (liftM, ap)
import Control.Monad.Fix
import System.IO
import Data.IORef
diff --git a/System/Console/Haskeline/MonadException.hs b/System/Console/Haskeline/MonadException.hs
index b796bf0..7ced927 100644
--- a/System/Console/Haskeline/MonadException.hs
+++ b/System/Console/Haskeline/MonadException.hs
@@ -28,9 +28,6 @@ module System.Console.Haskeline.MonadException(
import qualified Control.Exception as E
import Control.Exception (Exception,SomeException)
-#if __GLASGOW_HASKELL__ < 705
-import Prelude hiding (catch)
-#endif
import Control.Monad(liftM, join)
import Control.Monad.IO.Class
import Control.Monad.Trans.Identity
diff --git a/System/Console/Haskeline/Monads.hs b/System/Console/Haskeline/Monads.hs
index d5fc1bb..b8e8369 100644
--- a/System/Console/Haskeline/Monads.hs
+++ b/System/Console/Haskeline/Monads.hs
@@ -29,9 +29,6 @@ import Control.Monad.Trans.Maybe (MaybeT(MaybeT),runMaybeT)
import Control.Monad.Trans.Reader hiding (ask,asks)
import qualified Control.Monad.Trans.Reader as Reader
import Data.IORef
-#if __GLASGOW_HASKELL__ < 705
-import Prelude hiding (catch)
-#endif
import System.Console.Haskeline.MonadException
@@ -44,7 +41,8 @@ instance Monad m => MonadReader r (ReaderT r m) where
instance Monad m => MonadReader s (StateT s m) where
ask = get
-instance (MonadReader r m, MonadTrans t, Monad (t m)) => MonadReader r (t m) where
+instance {-# OVERLAPPABLE #-} (MonadReader r m, MonadTrans t, Monad (t m))
+ => MonadReader r (t m) where
ask = lift ask
asks :: MonadReader r m => (r -> a) -> m a
@@ -111,7 +109,8 @@ instance Monad m => MonadState s (StateT s m) where
get = StateT $ \s -> return $ \f -> f s s
put s = s `seq` StateT $ \_ -> return $ \f -> f () s
-instance (MonadState s m, MonadTrans t, Monad (t m)) => MonadState s (t m) where
+instance {-# OVERLAPPABLE #-} (MonadState s m, MonadTrans t, Monad (t m))
+ => MonadState s (t m) where
get = lift get
put = lift . put
diff --git a/System/Console/Haskeline/Term.hs b/System/Console/Haskeline/Term.hs
index acdcf77..d1b5203 100644
--- a/System/Console/Haskeline/Term.hs
+++ b/System/Console/Haskeline/Term.hs
@@ -9,7 +9,7 @@ import System.Console.Haskeline.Completion(Completion)
import Control.Concurrent
import Control.Concurrent.STM
import Data.Word
-import Control.Exception (fromException, AsyncException(..),bracket_)
+import Control.Exception (fromException, AsyncException(..))
import Data.Typeable
import System.IO
import Control.Monad(liftM,when,guard)
@@ -104,7 +104,7 @@ class (MonadReader Prefs m , MonadReader Layout m, MonadException m)
=> CommandMonad m where
runCompletion :: (String,String) -> m (String,[Completion])
-instance (MonadTrans t, CommandMonad m, MonadReader Prefs (t m),
+instance {-# OVERLAPPABLE #-} (MonadTrans t, CommandMonad m, MonadReader Prefs (t m),
MonadException (t m),
MonadReader Layout (t m))
=> CommandMonad (t m) where
diff --git a/haskeline.cabal b/haskeline.cabal
index 26bca84..a915766 100644
--- a/haskeline.cabal
+++ b/haskeline.cabal
@@ -42,9 +42,9 @@ Library
-- We require ghc>=7.4.1 (base>=4.5) to use the base library encodings, even
-- though it was implemented in earlier releases, due to GHC bug #5436 which
-- wasn't fixed until 7.4.1
- Build-depends: base >=4.5 && < 4.13, containers>=0.4 && < 0.7,
+ Build-depends: base >=4.9 && < 4.13, containers>=0.4 && < 0.7,
directory>=1.1 && < 1.4, bytestring>=0.9 && < 0.11,
- filepath >= 1.2 && < 1.5, transformers >= 0.2 && < 0.6,
+ filepath >= 1.2 && < 1.5, transformers >= 0.4 && < 0.6,
process >= 1.0 && < 1.7, stm >= 2.4 && < 2.6
Default-Language: Haskell98
Default-Extensions:
@@ -53,7 +53,7 @@ Library
FlexibleContexts, ExistentialQuantification
ScopedTypeVariables, GeneralizedNewtypeDeriving
StandaloneDeriving
- MultiParamTypeClasses, OverlappingInstances
+ MultiParamTypeClasses,
UndecidableInstances
ScopedTypeVariables, CPP, DeriveDataTypeable,
PatternGuards
More information about the ghc-commits
mailing list