[commit: ghc] wip/travis: llvm.org/apt now has 3.6 binaries (424cb55)

[git at git.haskell.org]

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

On branch  : wip/travis
Link       : http://ghc.haskell.org/trac/ghc/changeset/424cb55e95c5f91402f15f618a627799bfecc327/ghc

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

commit 424cb55e95c5f91402f15f618a627799bfecc327
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Fri Feb 20 14:39:35 2015 +0100

    llvm.org/apt now has 3.6 binaries


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

424cb55e95c5f91402f15f618a627799bfecc327
 .travis.yml | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d3de022..79c7473 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,12 +12,8 @@ env:
 
 before_install:
  - travis_retry sudo add-apt-repository -y ppa:hvr/ghc
- #- travis_retry sudo add-apt-repository -y ppa:h-rayflood/gcc-upper
- #- travis_retry sudo add-apt-repository -y ppa:h-rayflood/llvm-upper
- #- travis_retry sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
- #- travis_retry sudo sh -c "echo 'deb http://llvm.org/apt/precise/ llvm-toolchain-precise main' >> /etc/apt/sources.list"
- #- wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key | sudo apt-key add -
- - travis_retry sudo add-apt-repository -y ppa:xorg-edgers/ppa # seems to be a source for llvm-3.6
+ - travis_retry sudo sh -c "echo 'deb http://llvm.org/apt/precise/ llvm-toolchain-precise-3.6-binaries main' >> /etc/apt/sources.list"
+ - wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key | sudo apt-key add -
  - travis_retry sudo apt-get update
  - travis_retry sudo apt-get install cabal-install-1.18 ghc-7.6.3 alex-3.1.3 happy-1.19.4
  - travis_retry sudo apt-get install llvm-3.6