Skip to content

Commit

Permalink
changes for initial support with ghc 8.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
codedmart committed May 27, 2016
1 parent 2b26875 commit 15c4a95
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 7 deletions.
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ env:
#- 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.1
- CABALVER=1.22 GHCVER=7.10.2
- CABALVER=1.24 GHCVER=8.0.1

# Note: the distinction between `before_install` and `install` is not important.
before_install:
Expand Down
14 changes: 9 additions & 5 deletions rethinkdb.cabal
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: rethinkdb
version: 2.2.0.4
version: 2.2.0.5
cabal-version: >=1.8
build-type: Simple
license: Apache
Expand All @@ -22,7 +22,7 @@ flag dev

library
build-depends:
base >=4 && <4.9,
base >=4 && <4.10,
unordered-containers ==0.2.*,
text >=0.11 && <1.3,
aeson >=0.7 && <0.12,
Expand All @@ -32,9 +32,9 @@ library
network >=2.4 && <2.7,
mtl >=2.1 && <2.3,
vector >=0.10 && <0.12,
time >=1.4 && <1.6,
time >=1.4 && <1.7,
utf8-string >=0.3 && <1.1,
binary >=0.5 && <0.8,
binary >=0.5 && <0.9,
scientific ==0.3.*,
base64-bytestring ==1.0.*

Expand Down Expand Up @@ -66,7 +66,11 @@ library
Database.RethinkDB.Doctest
exposed: True
buildable: True
ghc-options: -Wall

if impl(ghc > 8)
ghc-options: -Wall -Wno-redundant-constraints
else
ghc-options: -Wall

test-suite doctests
build-depends:
Expand Down
3 changes: 3 additions & 0 deletions stack-7.10.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
resolver: lts-5.13
packages:
- '.'
2 changes: 1 addition & 1 deletion stack.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
resolver: lts-5.13
resolver: nightly-2016-05-27
packages:
- '.'

0 comments on commit 15c4a95

Please sign in to comment.