@@ -12,20 +12,16 @@ matrix:
1212 addons: {apt: {packages: [cabal-install-1.18, ghc-7.6.3], sources: [hvr-ghc]}}
1313 - env: CABALVER=1.18 GHCVER=7.8.4 GHCOPTS="-Werror" JOPTS="-j2"
1414 addons: {apt: {packages: [cabal-install-1.18, ghc-7.8.4], sources: [hvr-ghc]}}
15− - env: CABALVER=1.22 GHCVER=7.10.2 GHCOPTS="" JOPTS="-j2"
16− addons: {apt: {packages: [cabal-install-1.22, ghc-7.10.2],sources: [hvr-ghc]}}
15+ - env: CABALVER=1.22 GHCVER=7.10.1 GHCOPTS="" JOPTS="-j2"
16+ addons: {apt: {packages: [cabal-install-1.22, ghc-7.10.1],sources: [hvr-ghc]}}
1717# - env: CABALVER=head GHCVER=head GHCOPTS="-Werror" JOPTS="-j2"
1818# addons: {apt: {packages: [cabal-install-head,ghc-head], sources: [hvr-ghc]}}
1919
2020# Note: the distinction between `before_install` and `install` is not important.
2121before_install:
22− - export PATH=/opt/ghc/$GHCVER/bin:$PATH
22+ - export PATH=/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$PATH
2323
2424install:
25− # diagnostics:
26− - echo $PATH
27− - ls /opt/ghc/
28− - which ghc
2925 - cabal-$CABALVER update
3026# - git clone https://github.com/jgm/pandoc-types && cd pandoc-types && cabal-1.18 install && cd ..
3127 - cabal-$CABALVER install $JOPTS --only-dependencies --enable-tests