Skip to content

Commit dd6fafd

Browse files
authored
Merge pull request #38 from hasura/master
Support GHC 8.10
2 parents 765a0a2 + cb38c33 commit dd6fafd

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

.travis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ before_cache:
2626
- rm -rfv $CABALHOME/packages/head.hackage
2727
matrix:
2828
include:
29+
- compiler: ghc-8.10.1
30+
addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.10.1","cabal-install-3.2"]}}
2931
- compiler: ghc-8.8.3
3032
addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.8.3","cabal-install-3.0"]}}
3133
- compiler: ghc-8.6.5

System/Metrics.hs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ module System.Metrics
6868
, Value(..)
6969
) where
7070

71-
import Control.Applicative ((<$>))
7271
import Control.Monad (forM)
7372
import Data.Int (Int64)
7473
import qualified Data.IntMap.Strict as IM

ekg-core.cabal

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ maintainer: Johan Tibell <johan.tibell@gmail.com>,
1414
category: System
1515
build-type: Simple
1616
extra-source-files: CHANGES.md
17-
tested-with: GHC == 8.8.3, GHC == 8.6.5, GHC == 8.4.4,
18-
GHC == 8.2.2, GHC == 8.0.2, GHC == 7.10.3,
19-
GHC == 7.8.4, GHC == 7.6.3
17+
tested-with: GHC == 8.10.1, GHC == 8.8.3, GHC == 8.6.5,
18+
GHC == 8.4.4, GHC == 8.2.2, GHC == 8.0.2,
19+
GHC == 7.10.3, GHC == 7.8.4, GHC == 7.6.3
2020

2121
library
2222
exposed-modules:
@@ -33,8 +33,8 @@ library
3333
System.Metrics.ThreadId
3434

3535
build-depends:
36-
ghc-prim < 0.6,
37-
base >= 4.6 && < 4.14,
36+
ghc-prim < 0.7,
37+
base >= 4.6 && < 4.15,
3838
containers >= 0.5 && < 0.7,
3939
text < 1.3,
4040
unordered-containers < 0.3

0 commit comments

Comments
 (0)