hasufell/ghc-mod
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Daniel Vigovszky 2015-04-30 14:21:21 +02:00
commit 666c231f2a
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@ -10,7 +10,7 @@ install:
# - ( $CABAL122 && cabal install cabal-install --constraint "Cabal >= 1.22" && ghc-pkg unregister Cabal ) || true # - ( $CABAL122 && cabal install cabal-install --constraint "Cabal >= 1.22" && ghc-pkg unregister Cabal ) || true
- echo $PATH - echo $PATH
- which cabal - which cabal
# - cabal install Cabal --constraint "Cabal == $(cabal --version | grep 'Cabal library' | awk '{ print $3 }' | tail -n1)" - if [ -n "$(cabal --version | grep 'Cabal library' | awk '{ print $3 }' | tail -n1 | sed -n '/^1.18/p')" ]; then cabal install cabal-install --constraint "Cabal == 1.18.* && > 1.18.0"; fi
- cabal install happy - cabal install happy
- happy --version - happy --version
- cabal install -j --only-dependencies --enable-tests --constraint "tagged < 0.8" - cabal install -j --only-dependencies --enable-tests --constraint "tagged < 0.8"
@ -26,7 +26,6 @@ script:
- if [ -n "$(ghc --version | awk '{ print $8 }' | sed -n '/^7.8/p')" ]; then export WERROR="--ghc-option=-Werror"; fi - if [ -n "$(ghc --version | awk '{ print $8 }' | sed -n '/^7.8/p')" ]; then export WERROR="--ghc-option=-Werror"; fi
- cabal configure --enable-tests $WERROR - cabal configure --enable-tests $WERROR
- cabal build - cabal build
- export cabal_helper_libexecdir=$HOME/.cabal/bin
- export ghc_mod_datadir=$PWD - export ghc_mod_datadir=$PWD
- cabal test - cabal test

2
ghc-mod.cabal
View File

@ -121,7 +121,7 @@ Library
, bytestring , bytestring
, cereal >= 0.4 , cereal >= 0.4
, containers , containers
, cabal-helper >= 0.3.2.0 , cabal-helper >= 0.3.3.0
, deepseq , deepseq
, directory , directory
, filepath , filepath