git.iko.soy/typeable/pandoc
on master help sign in
Revert "Give up support for ghc 7.4."

This reverts commit e0c83f74f39ca94437d0b6f823c6f932aa663fe0.

commit384d03dcfe6466e459db004a6376633ae98d2c3e authorJohn MacFarlane <jgm@berkeley.edu> dateMon 9 Nov 2015, 10:07 (11 years ago) parente0c83f7
3 files changed+5−2
compare with master
unifiedsplit
.travis.yml+3 make_travis_yml.hs+1−1 pandoc.cabal+1−1
.travis.yml+3
@@ -13,6 +13,9 @@ before_cache:
1313
1414matrix:
1515 include:
16+ - env: CABALVER=1.16 GHCVER=7.4.2 GHCOPTS=-Werror
17+ compiler: ": #GHC 7.4.2"
18+ addons: {apt: {packages: [cabal-install-1.16,ghc-7.4.2], sources: [hvr-ghc]}}
1619 - env: CABALVER=1.16 GHCVER=7.6.3 GHCOPTS=-Werror
1720 compiler: ": #GHC 7.6.3"
1821 addons: {apt: {packages: [cabal-install-1.16,ghc-7.6.3], sources: [hvr-ghc]}}
make_travis_yml.hs+1−1
@@ -90,7 +90,7 @@ genTravisFromCabalFile fn xpkgs = do
9090 let cvs = disp' (lookupCabVer gv)
9191 gvs = disp' gv
9292 ghcopts = if gv >= Version [7,10,0] []
93− then "-Werror"
93+ then ""
9494 else "-Werror"
9595
9696 xpkgs' = concatMap (',':) xpkgs
pandoc.cabal+1−1
@@ -11,7 +11,7 @@ Bug-Reports: https://github.com/jgm/pandoc/issues
1111Stability: alpha
1212Homepage: http://pandoc.org
1313Category: Text
14−Tested-With: GHC == 7.6.3, GHC == 7.8.4, GHC == 7.10.2
14+Tested-With: GHC == 7.4.2, GHC == 7.6.3, GHC == 7.8.4, GHC == 7.10.2
1515Synopsis: Conversion between markup formats
1616Description: Pandoc is a Haskell library for converting from one markup
1717 format to another, and a command-line tool that uses