Merge pull request #237 from sol/master

Test Hackage breakage

.travis.yml

@@ -1,26 +1,32 @@
 sudo: false
 
+language: c
+
+env:
+  - GHCVER=7.8.4
+  - GHCVER=7.10.2
+
 addons:
   apt:
+    sources:
+      - hvr-ghc
     packages:
+      - ghc-7.8.4
+      - ghc-7.10.2
+      - cabal-install-1.22
       - libgmp-dev
 
-env:
-  - STACK_YAML=stack-ghc-7.8.4.yaml
-  - STACK_YAML=stack.yaml
-
 install:
-  # stack
+  - (mkdir -p $HOME/.local/bin && cd $HOME/.local/bin && wget https://zalora-public.s3.amazonaws.com/tinc && chmod +x tinc)
-  - mkdir -p ~/.local/bin
+  - export PATH=/opt/ghc/$GHCVER/bin:/opt/cabal/1.22/bin:$PATH
-  - travis_retry curl -L https://github.com/commercialhaskell/stack/releases/download/v0.1.4.0/stack-0.1.4.0-x86_64-linux.tar.gz | tar -xvzf -
+  - ghc --version
-  - mv stack ~/.local/bin
+  - cabal --version
-  - export PATH=~/.local/bin:$PATH
+  - travis_retry cabal update
-  - stack --version
+  - sed -i 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config
 
 script:
-  - stack setup
+  - for package in $(cat sources.txt); do (cd $package && tinc && cabal configure --enable-tests --disable-optimization && cabal build && cabal test) || exit 1; done
-  - stack build --test --ghc-options "-Werror"
 
 cache:
   directories:
-    - $HOME/.stack
+    - $HOME/.tinc/cache

servant-blaze/tinc.yaml

@@ -0,0 +1,3 @@
+dependencies:
+  - name: servant
+    path: ../servant

servant-cassava/tinc.yaml

@@ -0,0 +1,3 @@
+dependencies:
+  - name: servant
+    path: ../servant

servant-client/tinc.yaml

@@ -0,0 +1,5 @@
+dependencies:
+  - name: servant
+    path: ../servant
+  - name: servant-server
+    path: ../servant-server

servant-docs/tinc.yaml

@@ -0,0 +1,3 @@
+dependencies:
+  - name: servant
+    path: ../servant

servant-examples/tinc.yaml

@@ -0,0 +1,15 @@
+dependencies:
+  - name: servant
+    path: ../servant
+  - name: servant-server
+    path: ../servant-server
+  - name: servant-client
+    path: ../servant-client
+  - name: servant-js
+    path: ../servant-js
+  - name: servant-lucid
+    path: ../servant-lucid
+  - name: servant-docs
+    path: ../servant-docs
+  - name: servant-foreign
+    path: ../servant-foreign

servant-examples/tutorial/T1.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP           #-}
 {-# LANGUAGE DataKinds     #-}
 {-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE TypeFamilies  #-}
@@ -17,10 +18,12 @@ data User = User
   , registration_date :: Day
   } deriving (Eq, Show, Generic)
 
+#if !MIN_VERSION_aeson(0,10,0)
 -- orphan ToJSON instance for Day. necessary to derive one for User
 instance ToJSON Day where
   -- display a day in YYYY-mm-dd format
   toJSON d = toJSON (showGregorian d)
+#endif
 
 instance ToJSON User
 

servant-examples/tutorial/T2.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP           #-}
 {-# LANGUAGE DataKinds     #-}
 {-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE TypeFamilies  #-}
@@ -17,10 +18,12 @@ data User = User
   , registration_date :: Day
   } deriving (Eq, Show, Generic)
 
+#if !MIN_VERSION_aeson(0,10,0)
 -- orphan ToJSON instance for Day. necessary to derive one for User
 instance ToJSON Day where
   -- display a day in YYYY-mm-dd format
   toJSON d = toJSON (showGregorian d)
+#endif
 
 instance ToJSON User
 

servant-foreign/tinc.yaml

@@ -0,0 +1,3 @@
+dependencies:
+  - name: servant
+    path: ../servant

servant-js/tinc.yaml

@@ -0,0 +1,7 @@
+dependencies:
+  - name: servant
+    path: ../servant
+  - name: servant-server
+    path: ../servant-server
+  - name: servant-foreign
+    path: ../servant-foreign

servant-lucid/tinc.yaml

@@ -0,0 +1,3 @@
+dependencies:
+  - name: servant
+    path: ../servant

servant-mock/tinc.yaml

@@ -0,0 +1,5 @@
+dependencies:
+  - name: servant
+    path: ../servant
+  - name: servant-server
+    path: ../servant-server

servant-server/tinc.yaml

@@ -0,0 +1,3 @@
+dependencies:
+  - name: servant
+    path: ../servant