Fix deps; tweak travis config; cleanup.

.travis.yml

@@ -13,12 +13,13 @@ addons:
     packages:
       - ghc-7.8.4
       - ghc-7.10.2
+      - alex-3.1.4
       - cabal-install-1.22
       - libgmp-dev
 
 install:
   - (mkdir -p $HOME/.local/bin && cd $HOME/.local/bin && wget https://zalora-public.s3.amazonaws.com/tinc && chmod +x tinc)
-  - export PATH=/opt/ghc/$GHCVER/bin:/opt/cabal/1.22/bin:$PATH
+  - export PATH=/opt/ghc/$GHCVER/bin:/opt/cabal/1.22/bin:/opt/alex/3.1.4/bin:$PATH
   - ghc --version
   - cabal --version
   - travis_retry cabal update

servant-purescript/.travis.yml

@@ -1,13 +0,0 @@
-language: haskell
-ghc:
-  - 7.8
-notifications:
-  email:
-    on_success: change
-    on_failure: change
-before_install:
-  - cabal sandbox init
-  - git clone https://github.com/haskell-servant/servant.git
-  - cabal sandbox add-source servant/
-  - git clone https://github.com/haskell-servant/servant-jquery.git
-  - cabal sandbox add-source servant-jquery/

servant-purescript/servant-purescript.cabal

@@ -11,19 +11,14 @@ copyright:           2015 Anchor
 category:            Web
 build-type:          Simple
 cabal-version:       >=1.10
-Bug-reports:         http://github.com/anchor/servant-purescript/issues
+Bug-reports:         http://github.com/haskell-servant/servant/issues
 source-repository head
   type: git
-  location: http://github.com/anchor/servant-purescript.git
-
-flag example
-  description: Build the example too
-  manual:      True
-  default:     False
+  location: http://github.com/haskell-servant/servant.git
 
 library
   exposed-modules:     Servant.PureScript
-  build-depends:       base >=4.8.1.0 && <5
+  build-depends:       base >=4.5 && <5
                      , lens >=4
                      , purescript >=0.7.5.3
                      , servant >=0.5
@@ -41,7 +36,7 @@ test-suite spec
   ghc-options:       -Wall
   main-is:           Spec.hs
   build-depends:
-      base >=4.8.1.0 && <5
+      base >=4.5 && <5
     , hspec >=2.0
     , hspec-expectations
     , language-ecmascript >=0.17
@@ -52,6 +47,6 @@ test-suite spec
     , servant >=0.5
     , servant-foreign >=0.5
     , servant-js >=0.5
-    , servant-purescript ==0.0.2
+    , servant-purescript
     , string-conversions
   default-language: Haskell2010

servant-purescript/src/Servant/PureScript.hs

@@ -14,7 +14,7 @@ module Servant.PureScript (
 import           Control.Arrow ((&&&))
 import           Control.Lens (makeLenses, (^.), (^..), view)
 import           Data.Char (toUpper, toLower)
-import           Data.Proxy (Proxy(Proxy))
+import           Data.Proxy (Proxy)
 import           Data.String.Conversions (ConvertibleStrings, ST, cs, (<>))
 import qualified Data.Text as T
 import qualified Servant.JS as JS

servant-purescript/test/Spec.hs

@@ -8,11 +8,9 @@
 module Main where
 
 import           Control.Monad
-import           Control.Monad.IO.Class
 import           Data.Either (isRight)
 import           Data.Proxy
 import           Data.String.Conversions
-import qualified Data.Text.IO as ST
 import qualified Language.PureScript as P
 import           Servant.API
 import           Servant.Foreign as F

sources.txt

@@ -9,3 +9,4 @@ servant-examples
 servant-blaze
 servant-lucid
 servant-mock
+servant-purescript