[commit: ghc] wip/nfs-locking: Install alex, happy; adjust path only on ghc/cabal path only on linux. (17306dc)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/nfs-locking
Link       : http://ghc.haskell.org/trac/ghc/changeset/17306dc5a8e5ff70b3a0b973915fc6e6ec5cc3b7/ghc

>---------------------------------------------------------------

commit 17306dc5a8e5ff70b3a0b973915fc6e6ec5cc3b7
Author: Moritz Angermann <moritz.angermann at gmail.com>
Date:   Wed Jan 6 12:50:09 2016 +0800

    Install alex, happy; adjust path only on ghc/cabal path only on linux.


>---------------------------------------------------------------

17306dc5a8e5ff70b3a0b973915fc6e6ec5cc3b7
 .travis.yml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6e1bf5b..64e8597 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,9 @@ os:
     - osx
 
 env:
-    - CABALVER=1.22 GHCVER=7.10.3
+    matrix:
+        linux:
+            - CABALVER=1.22 GHCVER=7.10.3
 
 addons:
     apt:
@@ -20,10 +22,10 @@ addons:
 before_install:
     - if [ $TRAVIS_OS_NAME == osx ]; then brew update; fi
     - if [ $TRAVIS_OS_NAME == osx ]; then brew install ghc cabal-install; fi
-
+    - if [ $TRAVIS_OS_NAME == osx ]; then cabal install alex happy; fi
+    - if [ $TRAVIS_OS_NAME == linux ]; then PATH="/opt/ghc/$GHCVER/bin:$PATH"; fi
+    - if [ $TRAVIS_OS_NAME == linux ]; then PATH="/opt/cabal/$CABALVER/bin:$PATH"; fi
     - PATH="$HOME/.cabal/bin:$PATH"
-    - PATH="/opt/ghc/$GHCVER/bin:$PATH"
-    - PATH="/opt/cabal/$CABALVER/bin:$PATH"
     - export PATH
 
     - env