git.iko.soy/typeable/pandoc
on master help sign in
Test also on ghc 7.4.2.

Made make_travis_yml.hs a bit more robust.

commit3687dc36d584ed1758898e2ce612ff96f1d9f6a5 authorJohn MacFarlane <jgm@berkeley.edu> dateFri 9 Oct 2015, 14:44 (11 years ago) parent114103d
3 files changed+6−3
compare with master
unifiedsplit
.travis.yml+3 make_travis_yml.hs+2−2 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+2−2
@@ -4,7 +4,7 @@
44
55import Control.Monad
66import Data.List
7−import Data.Version (makeVersion)
7+import Data.Version
88import System.Environment
99import System.Exit
1010import System.IO
@@ -89,7 +89,7 @@ genTravisFromCabalFile fn xpkgs = do
8989 forM_ testedGhcVersions $ \gv -> do
9090 let cvs = disp' (lookupCabVer gv)
9191 gvs = disp' gv
92− ghcopts = if gv >= makeVersion [7,10,0]
92+ ghcopts = if gv >= Version [7,10,0] []
9393 then ""
9494 else "-Werror"
9595
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