From 384d03dcfe6466e459db004a6376633ae98d2c3e Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Mon, 9 Nov 2015 10:07:52 -0800
Subject: [PATCH] Revert "Give up support for ghc 7.4."
This reverts commit e0c83f74f39ca94437d0b6f823c6f932aa663fe0.
---
.travis.yml | 3 +++
make_travis_yml.hs | 2 +-
pandoc.cabal | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index cd6b1ee25..2901288e9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,6 +13,9 @@ before_cache:
matrix:
include:
+ - env: CABALVER=1.16 GHCVER=7.4.2 GHCOPTS=-Werror
+ compiler: ": #GHC 7.4.2"
+ addons: {apt: {packages: [cabal-install-1.16,ghc-7.4.2], sources: [hvr-ghc]}}
- env: CABALVER=1.16 GHCVER=7.6.3 GHCOPTS=-Werror
compiler: ": #GHC 7.6.3"
addons: {apt: {packages: [cabal-install-1.16,ghc-7.6.3], sources: [hvr-ghc]}}
diff --git a/make_travis_yml.hs b/make_travis_yml.hs
index 84c58d0d0..91916c499 100644
--- a/make_travis_yml.hs
+++ b/make_travis_yml.hs
@@ -90,7 +90,7 @@ genTravisFromCabalFile fn xpkgs = do
let cvs = disp' (lookupCabVer gv)
gvs = disp' gv
ghcopts = if gv >= Version [7,10,0] []
- then "-Werror"
+ then ""
else "-Werror"
xpkgs' = concatMap (',':) xpkgs
diff --git a/pandoc.cabal b/pandoc.cabal
index fcdadb324..2c7447706 100644
--- a/pandoc.cabal
+++ b/pandoc.cabal
@@ -11,7 +11,7 @@ Bug-Reports: https://github.com/jgm/pandoc/issues
Stability: alpha
Homepage: http://pandoc.org
Category: Text
-Tested-With: GHC == 7.6.3, GHC == 7.8.4, GHC == 7.10.2
+Tested-With: GHC == 7.4.2, GHC == 7.6.3, GHC == 7.8.4, GHC == 7.10.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