Skip to content

Commit e9839cf

Browse files
committed
GHC 8.2.2 / LTS 10 / generic-deriving 1.12
1 parent 9ea2789 commit e9839cf

File tree

7 files changed

+23
-14
lines changed

7 files changed

+23
-14
lines changed

.travis.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ before_cache:
1919

2020
matrix:
2121
include:
22-
- env: BUILD=hlint CABALVER=2.0 GHCVER=8.2.1
23-
compiler: ": #GHC 8.2.1"
24-
addons: {apt: {packages: [cabal-install-2.0,ghc-8.2.1], sources: [hvr-ghc]}}
25-
- env: BUILD=stack CABALVER=2.0 GHCVER=8.2.1 STACK_YAML=stack-bench.yaml
26-
compiler: ": #GHC 8.2.1"
27-
addons: {apt: {packages: [cabal-install-2.0,ghc-8.2.1], sources: [hvr-ghc]}}
28-
- env: BUILD=stack CABALVER=2.0 GHCVER=8.2.1 STACK_YAML=stack-ffi-unescape.yaml
29-
compiler: ": #GHC 8.2.1"
22+
- env: BUILD=hlint CABALVER=2.0 GHCVER=8.2.2
23+
compiler: ": #GHC 8.2.2"
24+
addons: {apt: {packages: [cabal-install-2.0,ghc-8.2.2], sources: [hvr-ghc]}}
25+
- env: BUILD=stack CABALVER=2.0 GHCVER=8.2.2 STACK_YAML=stack-bench.yaml
26+
compiler: ": #GHC 8.2.2"
27+
addons: {apt: {packages: [cabal-install-2.0,ghc-8.2.2], sources: [hvr-ghc]}}
28+
- env: BUILD=stack CABALVER=2.0 GHCVER=8.2.2 STACK_YAML=stack-ffi-unescape.yaml
29+
compiler: ": #GHC 8.2.2"
3030
addons: {apt: {packages: [cabal-install-2.0,ghc-8.0.2], sources: [hvr-ghc]}}
3131
- env: BUILD=cabal CABALVER=2.0 GHCVER=8.0.2
3232
compiler: ": #GHC 8.0.2"

aeson.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ test-suite tests
212212
directory,
213213
dlist,
214214
filepath,
215-
generic-deriving >= 1.10 && < 1.12,
215+
generic-deriving >= 1.10 && < 1.13,
216216
ghc-prim >= 0.2,
217217
hashable >= 1.2.4.0,
218218
scientific,

cabal.project

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
with-compiler: ghc
2-
packages: ., attoparsec-iso8601
2+
packages: ., attoparsec-iso8601, benchmarks

stack-bench.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
resolver: nightly-2017-11-20
1+
resolver: nightly-2017-12-23
22
# We use aeson in the snapshot to
33
# - avoid recompilation of criterion
44
# - compare against it
@@ -10,4 +10,4 @@ work-dir: .stack-work-bench
1010
packages:
1111
- benchmarks
1212
extra-deps:
13-
- aeson-1.2.2.0
13+
- aeson-1.2.3.0

stack-ffi-unescape.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
resolver: nightly-2017-10-18
1+
resolver: lts-10.0
22
packages:
33
- '.'
44
flags:

stack-lts10.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
resolver: lts-10.0
2+
packages:
3+
- '.'
4+
flags:
5+
aeson:
6+
fast: true
7+
cffi: false
8+
attoparsec-iso8601:
9+
fast: true

stack-nightly.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
resolver: nightly-2017-11-20
1+
resolver: nightly-2017-12-23
22
packages:
33
- '.'
44
- attoparsec-iso8601

0 commit comments

Comments
 (0)