From ce83a128e1ceee879069d5e0dda8402aa2cbed32 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Sat, 30 Jun 2018 10:00:28 +0200 Subject: [PATCH] Use ghc 8.4.2 in travis and tested-with. 8.4.1 shipped with the wrong version of mtl, which didn't match its documented API. --- .travis.yml | 6 +++--- pandoc.cabal | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index fd482a498..c87ef4f82 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,9 +45,9 @@ matrix: compiler: ": #GHC 8.2.2" addons: {apt: {packages: [cabal-install-2.0,ghc-8.2.2,happy-1.19.5], sources: [hvr-ghc]}} - - env: BUILD=cabal GHCVER=8.4.1 CABALVER=2.2 OPTS="-O0 -Wall -Wincomplete-record-updates -Wnoncanonical-monad-instances -Wnoncanonical-monadfail-instances -fno-warn-unused-do-bind -Werror" FLAGS="fast embed_data_files" CABALARGS="--enable-benchmarks" - compiler: ": #GHC 8.4.1" - addons: {apt: {packages: [cabal-install-2.2,ghc-8.4.1,happy-1.19.5], sources: [hvr-ghc]}} + - env: BUILD=cabal GHCVER=8.4.2 CABALVER=2.2 OPTS="-O0 -Wall -Wincomplete-record-updates -Wnoncanonical-monad-instances -Wnoncanonical-monadfail-instances -fno-warn-unused-do-bind -Werror" FLAGS="fast embed_data_files" CABALARGS="--enable-benchmarks" + compiler: ": #GHC 8.4.2" + addons: {apt: {packages: [cabal-install-2.2,ghc-8.4.2,happy-1.19.5], sources: [hvr-ghc]}} # Build with the newest GHC and cabal-install. This is an accepted failure, # see below. diff --git a/pandoc.cabal b/pandoc.cabal index 636f77482..9a328cf97 100644 --- a/pandoc.cabal +++ b/pandoc.cabal @@ -11,7 +11,7 @@ bug-reports: https://github.com/jgm/pandoc/issues stability: alpha homepage: https://pandoc.org category: Text -tested-with: GHC == 7.10.3, GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.1 +tested-with: GHC == 7.10.3, GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.2 synopsis: Conversion between markup formats description: Pandoc is a Haskell library for converting from one markup format to another, and a command-line tool that uses