Allow building with GHC 8.0

Fixes commercialhaskell/stackage#1476
ku-fpg · May 24, 2016 · 948d8f3 · 948d8f3
1 parent ecbf5dc
commit 948d8f3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -22,11 +22,15 @@ matrix:
     - env: CABALVER=1.22 GHCVER=7.10.3
       compiler: ": #GHC 7.10.3"
       addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.3], sources: [hvr-ghc]}}
+    - env: CABALVER=1.24 GHCVER=8.0.1
+      compiler: ": #GHC 8.0.1"
+      addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.1], sources: [hvr-ghc]}}
     - env: CABALVER=head GHCVER=head
       compiler: ": #GHC head"
       addons: {apt: {packages: [cabal-install-head,ghc-head], sources: [hvr-ghc]}}
 
   allow_failures:
+    - env: CABALVER=1.24 GHCVER=8.0.1
     - env: CABALVER=head GHCVER=head
 
 before_install:

diff --git a/example/kansas-comet-example.cabal b/example/kansas-comet-example.cabal
@@ -23,7 +23,7 @@ data-files:
 
 Executable kansas-comet-example
     Other-Modules:       Paths_kansas_comet_example
-    Build-Depends:     base                 >= 4.6      && < 4.9,
+    Build-Depends:     base                 >= 4.6      && < 4.10,
                        aeson                >= 0.9      && < 0.12,
                        data-default-class   >= 0.0.1    && < 0.2,
                        scotty               >= 0.10     && < 0.12,

diff --git a/kansas-comet.cabal b/kansas-comet.cabal
@@ -27,14 +27,14 @@ Library
   other-modules:       Paths_kansas_comet
   default-language:    Haskell2010
   build-depends:       aeson                >= 0.9      && < 0.12,
-                       base                 >= 4.6      && < 4.9,
+                       base                 >= 4.6      && < 4.10,
                        containers           >= 0.4      && < 0.6,
                        data-default-class   >= 0.0.1    && < 0.2,
                        scotty               >= 0.10     && < 0.12,
                        stm                  >= 2.2      && < 2.5,
                        text                 >= 0.11.3.1 && < 1.6,
-                       time                 >= 1.2      && < 1.6,
-                       transformers         >= 0.3      && < 0.5,
+                       time                 >= 1.2      && < 1.7,
+                       transformers         >= 0.3      && < 0.6,
                        unordered-containers >= 0.2.3    && < 0.3
 
   GHC-options: -Wall