[commit: ghc] wip/nfs-locking: env for all, apt only for linux (a7610e0)

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

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

commit a7610e09f39b37e683848a161121f52ce01555df
Author: Moritz Angermann <moritz.angermann at gmail.com>
Date:   Wed Jan 6 12:15:00 2016 +0800

    env for all, apt only for linux


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

a7610e09f39b37e683848a161121f52ce01555df
 .travis.yml | 32 ++++++++++++++------------------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0a85228..0a8f49a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,24 +4,20 @@ os:
     - linux
     - osx
 
-matrix:
-    include:
-        - env:
-            CABALVER=1.22
-            GHCVER=7.10.3
-
-          addons: {
-              apt: {
-                  packages: [
-                      ghc-7.10.3,
-                      alex-3.1.4,
-                      happy-1.19.5,
-                      cabal-install-1.22,
-                      zlib1g-dev
-                  ],
-                  sources: [hvr-ghc]
-              }
-          }
+env:
+    - 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
 
 before_install: