Skip to content

Commit 93c7602

Browse files
int-emvdan
authored andcommitted
drop ghc-8.0 support and update Travis configuation
1 parent c631855 commit 93c7602

File tree

3 files changed

+5
-9
lines changed

3 files changed

+5
-9
lines changed

.travis.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ language: c
33

44
matrix:
55
include:
6-
- env: CABALVER=1.24 GHCVER=8.0.2
7-
addons: {apt: {packages: [cabal-install-1.24, ghc-8.0.2], sources: [hvr-ghc]}}
86
- env: CABALVER=2.0 GHCVER=8.2.2
97
addons: {apt: {packages: [cabal-install-2.0, ghc-8.2.2], sources: [hvr-ghc]}}
108
- env: CABALVER=2.2 GHCVER=8.4.3
119
addons: {apt: {packages: [cabal-install-2.2, ghc-8.4.3], sources: [hvr-ghc]}}
12-
- env: CABALVER=2.2 GHCVER=8.4.3 CONFIG_OPTS=--enable-executable-dynamic
13-
addons: {apt: {packages: [cabal-install-2.2, ghc-8.4.3], sources: [hvr-ghc]}}
10+
- env: CABALVER=2.4 GHCVER=8.6.1
11+
addons: {apt: {packages: [cabal-install-2.4, ghc-8.6.1], sources: [hvr-ghc]}}
12+
- env: CABALVER=2.4 GHCVER=8.6.1 CONFIG_OPTS=--enable-executable-dynamic
13+
addons: {apt: {packages: [cabal-install-2.4, ghc-8.6.1], sources: [hvr-ghc]}}
1414

1515
cache:
1616
directories:

hint.cabal

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ test-suite unit-tests
5151

5252
library
5353
build-depends: base == 4.*,
54-
ghc >= 8.0 && < 8.8,
54+
ghc >= 8.2 && < 8.8,
5555
ghc-paths,
5656
ghc-boot,
5757
mtl,

src/Hint/Typecheck.hs

-4
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,7 @@ normalizeType type_expr =
6565

6666
-- add a bogus Maybe, in order to use it with mayFail
6767
exprType :: GHC.GhcMonad m => String -> m (Maybe GHC.Type)
68-
#if __GLASGOW_HASKELL__ < 802
69-
exprType = fmap Just . GHC.exprType
70-
#else
7168
exprType = fmap Just . GHC.exprType GHC.TM_Inst
72-
#endif
7369

7470
-- add a bogus Maybe, in order to use it with mayFail
7571
typeKind :: GHC.GhcMonad m => String -> m (Maybe (GHC.Type, GHC.Kind))

0 commit comments

Comments
 (0)