[commit: ghc] wip/nfs-locking: collapse env, addons wihout linux (fb5ed14)

[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/fb5ed14f7d95b0ea65e925c15e04ed766fad9247/ghc

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

commit fb5ed14f7d95b0ea65e925c15e04ed766fad9247
Author: Moritz Angermann <moritz.angermann at gmail.com>
Date:   Wed Jan 6 12:16:48 2016 +0800

    collapse env, addons wihout linux


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

fb5ed14f7d95b0ea65e925c15e04ed766fad9247
 .travis.yml | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0a8f49a..09ed050 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,19 +5,17 @@ os:
     - osx
 
 env:
-    - CABALVER=1.22
-    - GHCVER=7.10.3
+    - CABALVER=1.22 GHCVER=7.10.3
 
 addons:
-    linux:
-        apt:
-            packages:
-                - ghc-7.10.3,
-                - alex-3.1.4,
-                - happy-1.19.5,
-                - cabal-install-1.22,
-                - zlib1g-dev
-            sources: hvr-ghc
+    apt:
+        packages:
+            - ghc-7.10.3,
+            - alex-3.1.4,
+            - happy-1.19.5,
+            - cabal-install-1.22,
+            - zlib1g-dev
+        sources: hvr-ghc
 
 before_install: