From 890e39e4ee1c02f945b2933089c97f0975942ce9 Mon Sep 17 00:00:00 2001
From: Daniel Gröber <dxld@darkboxed.org>
Date: Fri, 21 Aug 2015 10:12:33 +0200
Subject: Fix travis

---
 .travis.yml        | 5 +----
 cabal-helper.cabal | 2 +-
 tests/Spec.hs      | 5 ++---
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 04b16d4..85abc5a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -44,7 +44,4 @@ script:
   - cabal configure --enable-tests $WERROR
   - cabal build
   - ./dist/build/cabal-helper-wrapper/cabal-helper-wrapper . dist "compiler-version" "entrypoints" "source-dirs" "ghc-options" "ghc-src-options" "ghc-pkg-options" "ghc-lang-options"
-  - cabal test
-  - cabal install --enable-tests -j1 .
-  - cat "dist/test/cabal-helper-"*
-  - ls -l dist/test/
+  - ./dist/build/spec/spec
diff --git a/cabal-helper.cabal b/cabal-helper.cabal
index b0df657..e2ae09b 100644
--- a/cabal-helper.cabal
+++ b/cabal-helper.cabal
@@ -80,7 +80,7 @@ Executable cabal-helper-wrapper
                      , template-haskell
                      , temporary
                      , utf8-string
-
+                     , ghc-prim
 
 Test-Suite spec
   Default-Language:    Haskell2010
diff --git a/tests/Spec.hs b/tests/Spec.hs
index a334f36..35bdcc2 100644
--- a/tests/Spec.hs
+++ b/tests/Spec.hs
@@ -4,10 +4,9 @@ import System.Posix.Env (setEnv)
 import System.Process
 import System.Exit
 import Data.Maybe
-import Data.Either
 import Data.Version
 import Data.Functor
-import Control.Exception
+import Control.Exception as E
 import Control.Arrow
 
 import CabalHelper.Common
@@ -73,7 +72,7 @@ main = do
 
 compilePrivatePkgDb :: Version -> IO (Either ExitCode FilePath)
 compilePrivatePkgDb cabalVer = do
-    db <- installCabal defaultOptions cabalVer `catch`
+    db <- installCabal defaultOptions cabalVer `E.catch`
           \(SomeException _) -> errorInstallCabal cabalVer "dist"
     compileWithPkg "." (Just db) cabalVer
 
-- 
cgit v1.2.3