Merge pull request #50 from haskell-servant/jkarni/sundry-cleanup

Sundry cleanup

.travis.yml

@@ -1,10 +1,18 @@
 language: haskell
 
-ghc:
+env:
-  - 7.8
+  - CABALVER=1.18 GHCVER=7.8.4
+  - CABALVER=1.22 GHCVER=7.10.1
+
+before_install:
+ - travis_retry sudo add-apt-repository -y ppa:hvr/ghc
+ - travis_retry sudo apt-get update
+ - travis_retry sudo apt-get install cabal-install-$CABALVER ghc-$GHCVER
+ - export PATH=/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$PATH
+ - travis_retry cabal update
 
 install:
-  - ghc --version
+ - echo "$(ghc --version) [$(ghc --print-project-git-commit-id 2> /dev/null || echo '?')]"
  - cabal --version
 
 script:

README.md

@@ -21,8 +21,8 @@ We've written a [Getting Started](http://haskell-servant.github.io/getting-start
 
 ## Repositories and Haddocks
 
-- The core [servant](http://github.com/haskell-servant) package - [docs](http://hackage.haskell.org/package/servant)
+- The core [servant](http://github.com/haskell-servant/tree/master/servant) package - [docs](http://hackage.haskell.org/package/servant)
-- Implementing an HTTP server for a webservice API with [servant-server](http://github.com/haskell-servant/servant-server) - [docs](http://hackage.haskell.org/package/servant-server)
+- Implementing an HTTP server for a webservice API with [servant-server](http://github.com/haskell-servant/servant/tree/master/servant-server) - [docs](http://hackage.haskell.org/package/servant-server)
-- (Haskell) client-side function generation with [servant-client](http://github.com/haskell-servant/servant-client) - [docs](http://hackage.haskell.org/package/servant-client)
+- (Haskell) client-side function generation with [servant-client](http://github.com/haskell-servant/servant/tree/master/servant-client) - [docs](http://hackage.haskell.org/package/servant-client)
-- (Javascript) client-side function generation with [servant-jquery](http://github.com/haskell-servant/servant-jquery) - [docs](http://hackage.haskell.org/package/servant-jquery)
+- (Javascript) client-side function generation with [servant-jquery](http://github.com/haskell-servant/servant/tree/master/servant-jquery) - [docs](http://hackage.haskell.org/package/servant-jquery)
-- API docs generation with [servant-docs](http://github.com/haskell-servant/servant-docs) - [docs](http://hackage.haskell.org/package/servant-docs)
+- API docs generation with [servant-docs](http://github.com/haskell-servant/servant/tree/master/servant-docs) - [docs](http://hackage.haskell.org/package/servant-docs)

scripts/shell.nix

@@ -0,0 +1,20 @@
+# Get a Nix shell with all the packages installed
+# Also a good way of running the tests for all packages
+with (import <nixpkgs> {}).pkgs;
+let modifiedHaskellPackages = haskellngPackages.override {
+      overrides = with haskell-ng.lib ; self: super: {
+        servant = appendConfigureFlag ( self.callPackage ../servant {} )
+            "--ghc-options=-Werror";
+        servant-server = appendConfigureFlag (self.callPackage
+                ../servant-server {}) "--ghc-options=-Werror";
+        servant-client = appendConfigureFlag (self.callPackage
+            ../servant-client {}) "--ghc-options=-Werror";
+        servant-jquery = appendConfigureFlag (self.callPackage
+            ../servant-jquery {}) "--ghc-options=-Werror";
+        servant-docs   = appendConfigureFlag (self.callPackage ../servant-docs
+            {}) "--ghc-options=-Werror";
+      };
+    };
+in modifiedHaskellPackages.ghcWithPackages ( p : with p ; [
+    servant servant-server servant-client servant-jquery servant-docs
+])

scripts/test-all.sh

@@ -8,21 +8,25 @@
 #   DESCRIPTION: Run tests for all source directories listed in $SOURCES.
 #                Uses local versions of those sources.
 #
+#  REQUIREMENTS: bash >= 4
 #===============================================================================
 
 set -o nounset
 set -o errexit
 
-SOURCES=( servant servant-server servant-client servant-jquery servant-docs )
+DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
 GHC_FLAGS="-Werror"
+SOURCES_TXT="$( dirname $DIR)/sources.txt"
+CABAL=${CABAL:-cabal}
+
+declare -a SOURCES
+readarray -t SOURCES < "$SOURCES_TXT"
+
 
 prepare_sandbox () {
-    cabal sandbox init
+    $CABAL sandbox init
     for s in ${SOURCES[@]} ; do
-        cd "$s"
+        (cd "$s" && $CABAL sandbox init --sandbox=../ && $CABAL sandbox add-source .)
-        cabal sandbox init --sandbox=../
-        cabal sandbox add-source .
-        cd ..
     done
 }
 
@@ -30,10 +34,10 @@ test_each () {
     for s in ${SOURCES[@]} ; do
         echo "Testing $s..."
         cd "$s"
-        cabal install --only-dependencies --enable-tests
+        $CABAL install --only-dependencies --enable-tests
-        cabal configure --enable-tests --ghc-options="$GHC_FLAGS"
+        $CABAL configure --enable-tests --ghc-options="$GHC_FLAGS"
-        cabal build
+        $CABAL build
-        cabal test
+        $CABAL test
         cd ..
     done
 }

scripts/update-defaults-nix.sh

@@ -0,0 +1,24 @@
+#!/bin/bash -
+#===============================================================================
+#
+#         USAGE: ./update-defaults-nix.sh
+#
+#   DESCRIPTION: Updates the default.nix files in all source dirs
+#
+#  REQUIREMENTS: cabal2nix, bash >= 4
+#===============================================================================
+
+set -o nounset
+set -o errexit
+
+DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
+BASE_DIR="$( dirname $DIR)"
+SOURCES_TXT="$BASE_DIR/sources.txt"
+
+declare -a SOURCES
+readarray -t SOURCES < "$SOURCES_TXT"
+
+for s in ${SOURCES[@]} ; do
+    echo $s
+    (cd "$BASE_DIR/$s" && cabal2nix . > default.nix )
+done

servant-client/README.md

@@ -1,8 +1,5 @@
 # servant-client
 
-[![Build Status](https://secure.travis-ci.org/haskell-servant/servant-client.svg)](http://travis-ci.org/haskell-servant/servant-client)
-[![Coverage Status](https://coveralls.io/repos/haskell-servant/servant-client/badge.svg)](https://coveralls.io/r/haskell-servant/servant-client)
-
 ![servant](https://raw.githubusercontent.com/haskell-servant/servant/master/servant.png)
 
 This library lets you automatically derive Haskell functions that let you query each endpoint of a *servant* webservice.

servant-client/default.nix

@@ -0,0 +1,24 @@
+{ mkDerivation, aeson, attoparsec, base, bytestring, deepseq
+, either, exceptions, hspec, http-client, http-client-tls
+, http-media, http-types, HUnit, network, network-uri, QuickCheck
+, safe, servant, servant-server, stdenv, string-conversions, text
+, transformers, wai, warp
+}:
+mkDerivation {
+  pname = "servant-client";
+  version = "0.2.2";
+  src = ./.;
+  buildDepends = [
+    aeson attoparsec base bytestring either exceptions http-client
+    http-client-tls http-media http-types network-uri safe servant
+    string-conversions text transformers
+  ];
+  testDepends = [
+    aeson base bytestring deepseq either hspec http-client http-media
+    http-types HUnit network QuickCheck servant servant-server text wai
+    warp
+  ];
+  homepage = "http://haskell-servant.github.io/";
+  description = "automatical derivation of querying functions for servant webservices";
+  license = stdenv.lib.licenses.bsd3;
+}

servant-client/servant-client.cabal

@@ -16,6 +16,8 @@ description:
   > getAllBooks :: BaseUrl -> EitherT String IO [Book]
   > postNewBook :: Book -> BaseUrl -> EitherT String IO Book
   > (getAllBooks :<|> postNewBook) = client myApi
+  .
+  <https://github.com/haskell-servant/servant/blob/master/servant-client/CHANGELOG.md CHANGELOG>
 license:             BSD3
 license-file:        LICENSE
 author:              Alp Mestanogullari, Sönke Hahn, Julian K. Arni
@@ -26,10 +28,10 @@ build-type:          Simple
 cabal-version:       >=1.10
 tested-with:         GHC >= 7.8
 homepage:            http://haskell-servant.github.io/
-Bug-reports:         http://github.com/haskell-servant/servant-client/issues
+Bug-reports:         http://github.com/haskell-servant/servant/issues
 source-repository head
   type: git
-  location: http://github.com/haskell-servant/servant-client.git
+  location: http://github.com/haskell-servant/servant.git
 
 library
   exposed-modules:

servant-client/src/Servant/Client.hs

@@ -1,12 +1,15 @@
+{-# LANGUAGE CPP                  #-}
 {-# LANGUAGE DataKinds            #-}
-{-# LANGUAGE InstanceSigs #-}
-{-# LANGUAGE TypeFamilies #-}
-{-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE FlexibleContexts     #-}
 {-# LANGUAGE FlexibleInstances    #-}
+{-# LANGUAGE InstanceSigs         #-}
 {-# LANGUAGE OverloadedStrings    #-}
-{-# LANGUAGE OverlappingInstances #-}
 {-# LANGUAGE ScopedTypeVariables  #-}
+{-# LANGUAGE TypeFamilies         #-}
+{-# LANGUAGE TypeOperators        #-}
+#if !MIN_VERSION_base(4,8,0)
+{-# LANGUAGE OverlappingInstances #-}
+#endif
 -- | This module provides 'client' which can automatically generate
 -- querying functions for each endpoint just from the type representing your
 -- API.
@@ -123,14 +126,22 @@ instance HasClient Delete where
 -- side querying function that is created when calling 'client'
 -- will just require an argument that specifies the scheme, host
 -- and port to send the request to.
-instance (MimeUnrender ct result) => HasClient (Get (ct ': cts) result) where
+instance
+#if MIN_VERSION_base(4,8,0)
+         {-# OVERLAPPABLE #-}
+#endif
+  (MimeUnrender ct result) => HasClient (Get (ct ': cts) result) where
   type Client' (Get (ct ': cts) result) = BaseUrl -> EitherT ServantError IO result
   clientWithRoute Proxy req host =
     performRequestCT (Proxy :: Proxy ct) H.methodGet req [200, 203] host
 
 -- | If you have a 'Get xs ()' endpoint, the client expects a 204 No Content
 -- HTTP header.
-instance HasClient (Get (ct ': cts) ()) where
+instance
+#if MIN_VERSION_base(4,8,0)
+         {-# OVERLAPPING #-}
+#endif
+  HasClient (Get (ct ': cts) ()) where
   type Client' (Get (ct ': cts) ()) = BaseUrl -> EitherT ServantError IO ()
   clientWithRoute Proxy req host =
     performRequestNoBody H.methodGet req [204] host
@@ -176,7 +187,11 @@ instance (KnownSymbol sym, ToText a, HasClient sublayout)
 -- side querying function that is created when calling 'client'
 -- will just require an argument that specifies the scheme, host
 -- and port to send the request to.
-instance (MimeUnrender ct a) => HasClient (Post (ct ': cts) a) where
+instance
+#if MIN_VERSION_base(4,8,0)
+         {-# OVERLAPPABLE #-}
+#endif
+  (MimeUnrender ct a) => HasClient (Post (ct ': cts) a) where
   type Client' (Post (ct ': cts) a) = BaseUrl -> EitherT ServantError IO a
 
   clientWithRoute Proxy req uri =
@@ -184,7 +199,11 @@ instance (MimeUnrender ct a) => HasClient (Post (ct ': cts) a) where
 
 -- | If you have a 'Post xs ()' endpoint, the client expects a 204 No Content
 -- HTTP header.
-instance HasClient (Post (ct ': cts) ()) where
+instance
+#if MIN_VERSION_base(4,8,0)
+         {-# OVERLAPPING #-}
+#endif
+  HasClient (Post (ct ': cts) ()) where
   type Client' (Post (ct ': cts) ()) = BaseUrl -> EitherT ServantError IO ()
   clientWithRoute Proxy req host =
     void $ performRequestNoBody H.methodPost req [204] host
@@ -193,7 +212,11 @@ instance HasClient (Post (ct ': cts) ()) where
 -- side querying function that is created when calling 'client'
 -- will just require an argument that specifies the scheme, host
 -- and port to send the request to.
-instance (MimeUnrender ct a) => HasClient (Put (ct ': cts) a) where
+instance
+#if MIN_VERSION_base(4,8,0)
+         {-# OVERLAPPABLE #-}
+#endif
+  (MimeUnrender ct a) => HasClient (Put (ct ': cts) a) where
   type Client' (Put (ct ': cts) a) = BaseUrl -> EitherT ServantError IO a
 
   clientWithRoute Proxy req host =
@@ -201,7 +224,11 @@ instance (MimeUnrender ct a) => HasClient (Put (ct ': cts) a) where
 
 -- | If you have a 'Put xs ()' endpoint, the client expects a 204 No Content
 -- HTTP header.
-instance HasClient (Put (ct ': cts) ()) where
+instance
+#if MIN_VERSION_base(4,8,0)
+         {-# OVERLAPPING #-}
+#endif
+  HasClient (Put (ct ': cts) ()) where
   type Client' (Put (ct ': cts) ()) = BaseUrl -> EitherT ServantError IO ()
   clientWithRoute Proxy req host =
     void $ performRequestNoBody H.methodPut req [204] host
@@ -210,7 +237,11 @@ instance HasClient (Put (ct ': cts) ()) where
 -- side querying function that is created when calling 'client'
 -- will just require an argument that specifies the scheme, host
 -- and port to send the request to.
-instance (MimeUnrender ct a) => HasClient (Patch (ct ': cts) a) where
+instance
+#if MIN_VERSION_base(4,8,0)
+         {-# OVERLAPPABLE #-}
+#endif
+  (MimeUnrender ct a) => HasClient (Patch (ct ': cts) a) where
   type Client' (Patch (ct ': cts) a) = BaseUrl -> EitherT ServantError IO a
 
   clientWithRoute Proxy req host =
@@ -218,7 +249,11 @@ instance (MimeUnrender ct a) => HasClient (Patch (ct ': cts) a) where
 
 -- | If you have a 'Patch xs ()' endpoint, the client expects a 204 No Content
 -- HTTP header.
-instance HasClient (Patch (ct ': cts) ()) where
+instance
+#if MIN_VERSION_base(4,8,0)
+         {-# OVERLAPPING #-}
+#endif
+  HasClient (Patch (ct ': cts) ()) where
   type Client' (Patch (ct ': cts) ()) = BaseUrl -> EitherT ServantError IO ()
   clientWithRoute Proxy req host =
     void $ performRequestNoBody H.methodPatch req [204] host

servant-client/src/Servant/Common/Req.hs

@@ -1,8 +1,11 @@
+{-# LANGUAGE CPP                 #-}
 {-# LANGUAGE OverloadedStrings   #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 module Servant.Common.Req where
 
+#if !MIN_VERSION_base(4,8,0)
 import Control.Applicative
+#endif
 import Control.Exception
 import Control.Monad
 import Control.Monad.Catch (MonadThrow)

servant-client/test/Servant/ClientSpec.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP                #-}
 {-# LANGUAGE DataKinds          #-}
 {-# LANGUAGE DeriveGeneric      #-}
 {-# LANGUAGE FlexibleContexts   #-}
@@ -10,7 +11,9 @@
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 module Servant.ClientSpec where
 
-import           Control.Applicative
+#if !MIN_VERSION_base(4,8,0)
+import           Control.Applicative         ((<$>))
+#endif
 import qualified Control.Arrow              as Arrow
 import           Control.Concurrent
 import           Control.Exception
@@ -340,6 +343,6 @@ pathGen :: Gen (NonEmptyList Char)
 pathGen = fmap NonEmpty path
  where
   path = listOf1 $ elements $
-    filter (not . (`elem` "?%[]/#;")) $
+    filter (not . (`elem` ("?%[]/#;" :: String))) $
     filter isPrint $
     map chr [0..127]

servant-client/test/Servant/Common/BaseUrlSpec.hs

@@ -1,7 +1,10 @@
+{-# LANGUAGE CPP                  #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 module Servant.Common.BaseUrlSpec where
 
+#if !MIN_VERSION_base(4,8,0)
 import Control.Applicative
+#endif
 import Control.DeepSeq
 import Test.Hspec
 import Test.QuickCheck

servant-docs/README.md

@@ -1,14 +1,12 @@
 # servant-docs
 
-[![Build Status](https://secure.travis-ci.org/haskell-servant/servant-docs.svg)](http://travis-ci.org/haskell-servant/servant-docs)
-
 ![servant](https://raw.githubusercontent.com/haskell-servant/servant/master/servant.png)
 
 Generate API docs for your *servant* webservice. Feel free to also take a look at [servant-pandoc](https://github.com/mpickering/servant-pandoc) which uses this package to target a broad range of output formats using the excellent **pandoc**.
 
 ## Example
 
-See [here](https://github.com/haskell-servant/servant-docs/blob/master/example/greet.md) for the output of the following program.
+See [here](https://github.com/haskell-servant/servant/tree/master/servant-docs/blob/master/example/greet.md) for the output of the following program.
 
 ``` haskell
 {-# LANGUAGE DataKinds #-}

servant-docs/default.nix

@@ -12,7 +12,7 @@ mkDerivation {
     aeson base bytestring hashable http-media lens servant
     string-conversions text unordered-containers
   ];
-  testDepends = [ aeson base hspec lens servant ];
+  testDepends = [ aeson base hspec servant string-conversions ];
   homepage = "http://haskell-servant.github.io/";
   description = "generate API docs for your servant webservice";
   license = stdenv.lib.licenses.bsd3;

servant-docs/servant-docs.cabal

@@ -5,6 +5,8 @@ description:
   Library for generating API docs from a servant API definition.
   .
   Runnable example <https://github.com/haskell-servant/servant-docs/blob/master/example/greet.hs here>.
+  .
+  <https://github.com/haskell-servant/servant/blob/master/servant-docs/CHANGELOG.md CHANGELOG>
 license:             BSD3
 license-file:        LICENSE
 author:              Alp Mestanogullari, Sönke Hahn, Julian K. Arni
@@ -15,13 +17,13 @@ build-type:          Simple
 cabal-version:       >=1.10
 tested-with:         GHC >= 7.8
 homepage:            http://haskell-servant.github.io/
-Bug-reports:         http://github.com/haskell-servant/servant-docs/issues
+Bug-reports:         http://github.com/haskell-servant/servant/issues
 extra-source-files:
   CHANGELOG.md
   README.md
 source-repository head
   type: git
-  location: http://github.com/haskell-servant/servant-docs.git
+  location: http://github.com/haskell-servant/servant.git
 
 library
   exposed-modules:

servant-docs/src/Servant/Docs/Internal.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP                  #-}
 {-# LANGUAGE ConstraintKinds      #-}
 {-# LANGUAGE DataKinds            #-}
 {-# LANGUAGE DeriveGeneric        #-}
@@ -13,7 +14,9 @@
 {-# LANGUAGE UndecidableInstances #-}
 module Servant.Docs.Internal where
 
+#if !MIN_VERSION_base(4,8,0)
 import           Control.Applicative
+#endif
 import           Control.Lens
 import           Data.ByteString.Lazy.Char8 (ByteString)
 import           Data.Hashable

servant-jquery/README.md

@@ -1,15 +1,12 @@
 # servant-jquery
 
-[![Build Status](https://secure.travis-ci.org/haskell-servant/servant-jquery.svg)](http://travis-ci.org/haskell-servant/servant-jquery)
-[![Coverage Status](https://coveralls.io/repos/haskell-servant/servant-jquery/badge.svg)](https://coveralls.io/r/haskell-servant/servant-jquery)
-
 ![servant](https://raw.githubusercontent.com/haskell-servant/servant/master/servant.png)
 
 This library lets you derive automatically (JQuery based) Javascript functions that let you query each endpoint of a *servant* webservice.
 
 ## Example
 
-Read more about the following example [here](https://github.com/haskell-servant/servant-jquery/tree/master/examples#examples).
+Read more about the following example [here](https://github.com/haskell-servant/servant/tree/master/servant-jquery/tree/master/examples#examples).
 
 ``` haskell
 {-# LANGUAGE DataKinds #-}

servant-jquery/default.nix

@@ -0,0 +1,21 @@
+{ mkDerivation, aeson, base, charset, filepath, hspec
+, hspec-expectations, language-ecmascript, lens, servant
+, servant-server, stdenv, stm, text, transformers, warp
+}:
+mkDerivation {
+  pname = "servant-jquery";
+  version = "0.2.2";
+  src = ./.;
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    aeson base charset filepath lens servant servant-server stm text
+    transformers warp
+  ];
+  testDepends = [
+    base hspec hspec-expectations language-ecmascript lens servant
+  ];
+  homepage = "http://haskell-servant.github.io/";
+  description = "Automatically derive (jquery) javascript functions to query servant webservices";
+  license = stdenv.lib.licenses.bsd3;
+}

servant-jquery/servant-jquery.cabal

@@ -4,8 +4,11 @@ synopsis:            Automatically derive (jquery) javascript functions to query
 description:
   Automatically derive jquery-based javascript functions to query servant webservices.
   .
-  Example <https://github.com/haskell-servant/servant-jquery/blob/master/examples/counter.hs here> that serves the generated javascript to a webpage that lets you
+  You can find an example <https://github.com/haskell-servant/servant/blob/master/servant-jquery/examples/counter.hs here>
-  trigger webservice calls.
+  which serves the generated javascript to a webpage that allows you to trigger
+  webservice calls.
+  .
+  <https://github.com/haskell-servant/servant/blob/master/servant-jquery/CHANGELOG.md CHANGELOG>
 license:             BSD3
 license-file:        LICENSE
 author:              Alp Mestanogullari
@@ -15,13 +18,13 @@ category:            Web
 build-type:          Simple
 cabal-version:       >=1.10
 homepage:            http://haskell-servant.github.io/
-Bug-reports:         http://github.com/haskell-servant/servant-jquery/issues
+Bug-reports:         http://github.com/haskell-servant/servant/issues
 extra-source-files:
   CHANGELOG.md
   README.md
 source-repository head
   type: git
-  location: http://github.com/haskell-servant/servant-jquery.git
+  location: http://github.com/haskell-servant/servant.git
 
 flag example
   description: Build the example too

servant-jquery/src/Servant/JQuery/Internal.hs

@@ -1,15 +1,18 @@
-{-# LANGUAGE DataKinds #-}
+{-# LANGUAGE CPP                  #-}
-{-# LANGUAGE TypeFamilies #-}
-{-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE ConstraintKinds      #-}
-{-# LANGUAGE TemplateHaskell #-}
+{-# LANGUAGE DataKinds            #-}
 {-# LANGUAGE FlexibleContexts     #-}
 {-# LANGUAGE FlexibleInstances    #-}
 {-# LANGUAGE ScopedTypeVariables  #-}
+{-# LANGUAGE TemplateHaskell      #-}
+{-# LANGUAGE TypeFamilies         #-}
+{-# LANGUAGE TypeOperators        #-}
 {-# LANGUAGE UndecidableInstances #-}
 module Servant.JQuery.Internal where
 
+#if !MIN_VERSION_base(4,8,0)
 import Control.Applicative
+#endif
 import Control.Lens
 import Data.Char (toLower)
 import qualified Data.CharSet as Set

servant-server/README.md

@@ -1,8 +1,5 @@
 # servant-server
 
-[![Build Status](https://secure.travis-ci.org/haskell-servant/servant-server.svg)](http://travis-ci.org/haskell-servant/servant-server)
-[![Coverage Status](https://coveralls.io/repos/haskell-servant/servant-server/badge.svg)](https://coveralls.io/r/haskell-servant/servant-server)
-
 ![servant](https://raw.githubusercontent.com/haskell-servant/servant/master/servant.png)
 
 This library lets you *implement* an HTTP server with handlers for each endpoint of a servant API, handling most of the boilerplate for you.
@@ -14,7 +11,7 @@ We've written a [Getting Started](http://haskell-servant.github.io/getting-start
 ## Repositories and Haddocks
 
 - The core [servant](http://github.com/haskell-servant) package - [docs](http://hackage.haskell.org/package/servant)
-- Implementing an HTTP server for a webservice API with [servant-server](http://github.com/haskell-servant/servant-server) - [docs](http://hackage.haskell.org/package/servant-server)
+- Implementing an HTTP server for a webservice API with [servant-server](http://github.com/haskell-servant/servant/tree/master/servant-server) - [docs](http://hackage.haskell.org/package/servant-server)
-- (Haskell) client-side function generation with [servant-client](http://github.com/haskell-servant/servant-client) - [docs](http://hackage.haskell.org/package/servant-client)
+- (Haskell) client-side function generation with [servant-client](http://github.com/haskell-servant/servant/tree/master/servant-client) - [docs](http://hackage.haskell.org/package/servant-client)
-- (Javascript) client-side function generation with [servant-jquery](http://github.com/haskell-servant/servant-jquery) - [docs](http://hackage.haskell.org/package/servant-jquery)
+- (Javascript) client-side function generation with [servant-jquery](http://github.com/haskell-servant/servant/tree/master/servant-jquery) - [docs](http://hackage.haskell.org/package/servant-jquery)
-- API docs generation with [servant-docs](http://github.com/haskell-servant/servant-docs) - [docs](http://hackage.haskell.org/package/servant-docs)
+- API docs generation with [servant-docs](http://github.com/haskell-servant/servant/tree/master/servant-docs) - [docs](http://hackage.haskell.org/package/servant-docs)

servant-server/default.nix

@@ -1,15 +1,28 @@
-{ pkgs ? import <nixpkgs> { config.allowUnfree = true; }
+{ mkDerivation, aeson, attoparsec, base, bytestring
-, src ?  builtins.filterSource (path: type:
+, bytestring-conversion, directory, either, exceptions, hspec
-    type != "unknown" &&
+, hspec-wai, http-types, network, network-uri, parsec, QuickCheck
-    baseNameOf path != ".git" &&
+, safe, servant, split, stdenv, string-conversions, system-filepath
-    baseNameOf path != "result" &&
+, temporary, text, transformers, wai, wai-app-static, wai-extra
-    baseNameOf path != "dist") ./.
+, warp
-, servant ? import ../servant {}
 }:
-pkgs.haskellPackages.buildLocalCabalWithArgs {
+mkDerivation {
-  name = "servant-server";
+  pname = "servant-server";
-  inherit src;
+  version = "0.2.4";
-  args = {
+  src = ./.;
-      inherit servant;
+  isLibrary = true;
-  };
+  isExecutable = true;
+  buildDepends = [
+    aeson attoparsec base bytestring either http-types network-uri safe
+    servant split string-conversions system-filepath text transformers
+    wai wai-app-static warp
+  ];
+  testDepends = [
+    aeson base bytestring bytestring-conversion directory either
+    exceptions hspec hspec-wai http-types network parsec QuickCheck
+    servant string-conversions temporary text transformers wai
+    wai-extra warp
+  ];
+  homepage = "http://haskell-servant.github.io/";
+  description = "A family of combinators for defining webservices APIs and serving them";
+  license = stdenv.lib.licenses.bsd3;
 }

servant-server/servant-server.cabal

@@ -4,12 +4,16 @@ synopsis:            A family of combinators for defining webservices APIs and s
 description:
   A family of combinators for defining webservices APIs and serving them
   .
-  You can learn about the basics in <http://haskell-servant.github.io/getting-started/ the getting started> guide.
+  You can learn about the basics in <http://haskell-servant.github.io/getting-started/ the getting started>
+  guide.
   .
-  <https://github.com/haskell-servant/servant-server/blob/master/example/greet.hs Here>'s a runnable example, with comments, that defines a dummy API and
+  <https://github.com/haskell-servant/servant/blob/master/servant-server/example/greet.hs Here>
-  implements a webserver that serves this API, using this package.
+  is a runnable example, with comments, that defines a dummy API and implements
+  a webserver that serves this API, using this package.
+  .
+  <https://github.com/haskell-servant/servant/blob/master/servant-server/CHANGELOG.md CHANGELOG>
 homepage:            http://haskell-servant.github.io/
-Bug-reports:         http://github.com/haskell-servant/servant-server/issues
+Bug-reports:         http://github.com/haskell-servant/servant/issues
 license:             BSD3
 license-file:        LICENSE
 author:              Alp Mestanogullari, Sönke Hahn, Julian K. Arni

servant-server/src/Servant/Server/Internal.hs

@@ -1,22 +1,28 @@
+{-# LANGUAGE CPP                  #-}
 {-# LANGUAGE DataKinds            #-}
 {-# LANGUAGE FlexibleContexts     #-}
 {-# LANGUAGE FlexibleInstances    #-}
-{-# LANGUAGE OverlappingInstances #-}
 {-# LANGUAGE OverloadedStrings    #-}
 {-# LANGUAGE PolyKinds            #-}
 {-# LANGUAGE ScopedTypeVariables  #-}
 {-# LANGUAGE TypeFamilies         #-}
 {-# LANGUAGE TypeOperators        #-}
+#if !MIN_VERSION_base(4,8,0)
+{-# LANGUAGE OverlappingInstances #-}
+#endif
+
 module Servant.Server.Internal where
 
+#if !MIN_VERSION_base(4,8,0)
 import           Control.Applicative         ((<$>))
+import           Data.Monoid                 (Monoid, mappend, mempty)
+#endif
 import           Control.Monad.Trans.Either  (EitherT, runEitherT)
 import qualified Data.ByteString             as B
 import qualified Data.ByteString.Lazy        as BL
 import           Data.IORef                  (newIORef, readIORef, writeIORef)
 import           Data.List                   (unfoldr)
 import           Data.Maybe                  (catMaybes, fromMaybe)
-import           Data.Monoid                 (Monoid, mappend, mempty)
 import           Data.String                 (fromString)
 import           Data.String.Conversions     (cs, (<>))
 import           Data.Text                   (Text)
@@ -278,10 +284,13 @@ instance HasServer Delete where
 -- If successfully returning a value, we use the type-level list, combined
 -- with the request's @Accept@ header, to encode the value for you
 -- (returning a status code of 200). If there was no @Accept@ header or it
--- was @*/*@, we return encode using the first @Content-Type@ type on the
+-- was @*\/\*@, we return encode using the first @Content-Type@ type on the
 -- list.
-instance ( AllCTRender ctypes a
+instance
-         ) => HasServer (Get ctypes a) where
+#if MIN_VERSION_base(4,8,0)
+         {-# OVERLAPPABLE #-}
+#endif
+         ( AllCTRender ctypes a ) => HasServer (Get ctypes a) where
 
   type ServerT' (Get ctypes a) m = m a
 
@@ -290,7 +299,7 @@ instance ( AllCTRender ctypes a
         e <- runEitherT action
         respond $ case e of
           Right output -> do
-            let accH = fromMaybe "*/*" $ lookup hAccept $ requestHeaders request
+            let accH = fromMaybe ct_wildcard $ lookup hAccept $ requestHeaders request
             case handleAcceptH (Proxy :: Proxy ctypes) (AcceptHeader accH) output of
               Nothing -> failWith UnsupportedMediaType
               Just (contentT, body) -> succeedWith $
@@ -302,8 +311,14 @@ instance ( AllCTRender ctypes a
     | otherwise = respond $ failWith NotFound
 
 -- '()' ==> 204 No Content
-instance HasServer (Get ctypes ()) where
+instance
+#if MIN_VERSION_base(4,8,0)
+         {-# OVERLAPPING #-}
+#endif
+          HasServer (Get ctypes ()) where
+
   type ServerT' (Get ctypes ()) m = m ()
+
   route Proxy action request respond
     | pathIsEmpty request && requestMethod request == methodGet = do
         e <- runEitherT action
@@ -316,14 +331,20 @@ instance HasServer (Get ctypes ()) where
     | otherwise = respond $ failWith NotFound
 
 -- Add response headers
-instance ( AllCTRender ctypes v ) => HasServer (Get ctypes (Headers h v)) where
+instance
+#if MIN_VERSION_base(4,8,0)
+         {-# OVERLAPPING #-}
+#endif
+          ( AllCTRender ctypes v ) => HasServer (Get ctypes (Headers h v)) where
+
   type ServerT' (Get ctypes (Headers h v)) m = m (Headers h v)
+
   route Proxy action request respond
     | pathIsEmpty request && requestMethod request == methodGet = do
       e <- runEitherT action
       respond $ case e of
         Right output -> do
-          let accH = fromMaybe "*/*" $ lookup hAccept $ requestHeaders request
+          let accH = fromMaybe ct_wildcard $ lookup hAccept $ requestHeaders request
               headers = getHeaders output
           case handleAcceptH (Proxy :: Proxy ctypes) (AcceptHeader accH) (getResponse output) of
             Nothing -> failWith UnsupportedMediaType
@@ -378,9 +399,13 @@ instance (KnownSymbol sym, FromText a, HasServer sublayout)
 -- If successfully returning a value, we use the type-level list, combined
 -- with the request's @Accept@ header, to encode the value for you
 -- (returning a status code of 201). If there was no @Accept@ header or it
--- was @*/*@, we return encode using the first @Content-Type@ type on the
+-- was @*\/\*@, we return encode using the first @Content-Type@ type on the
 -- list.
-instance ( AllCTRender ctypes a
+instance
+#if MIN_VERSION_base(4,8,0)
+         {-# OVERLAPPABLE #-}
+#endif
+         ( AllCTRender ctypes a
          ) => HasServer (Post ctypes a) where
 
   type ServerT' (Post ctypes a) m = m a
@@ -390,7 +415,7 @@ instance ( AllCTRender ctypes a
         e <- runEitherT action
         respond $ case e of
           Right output -> do
-            let accH = fromMaybe "*/*" $ lookup hAccept $ requestHeaders request
+            let accH = fromMaybe ct_wildcard $ lookup hAccept $ requestHeaders request
             case handleAcceptH (Proxy :: Proxy ctypes) (AcceptHeader accH) output of
               Nothing -> failWith UnsupportedMediaType
               Just (contentT, body) -> succeedWith $
@@ -401,8 +426,14 @@ instance ( AllCTRender ctypes a
         respond $ failWith WrongMethod
     | otherwise = respond $ failWith NotFound
 
-instance HasServer (Post ctypes ()) where
+instance
+#if MIN_VERSION_base(4,8,0)
+         {-# OVERLAPPING #-}
+#endif
+         HasServer (Post ctypes ()) where
+
   type ServerT' (Post ctypes ()) m = m ()
+
   route Proxy action request respond
     | pathIsEmpty request && requestMethod request == methodPost = do
         e <- runEitherT action
@@ -415,14 +446,20 @@ instance HasServer (Post ctypes ()) where
     | otherwise = respond $ failWith NotFound
 
 -- Add response headers
-instance ( AllCTRender ctypes v ) => HasServer (Post ctypes (Headers h v)) where
+instance
+#if MIN_VERSION_base(4,8,0)
+         {-# OVERLAPPING #-}
+#endif
+         ( AllCTRender ctypes v ) => HasServer (Post ctypes (Headers h v)) where
+
   type ServerT' (Post ctypes (Headers h v)) m = m (Headers h v)
+
   route Proxy action request respond
     | pathIsEmpty request && requestMethod request == methodPost = do
       e <- runEitherT action
       respond $ case e of
         Right output -> do
-          let accH = fromMaybe "*/*" $ lookup hAccept $ requestHeaders request
+          let accH = fromMaybe ct_wildcard $ lookup hAccept $ requestHeaders request
               headers = getHeaders output
           case handleAcceptH (Proxy :: Proxy ctypes) (AcceptHeader accH) (getResponse output) of
             Nothing -> failWith UnsupportedMediaType
@@ -445,10 +482,13 @@ instance ( AllCTRender ctypes v ) => HasServer (Post ctypes (Headers h v)) where
 -- If successfully returning a value, we use the type-level list, combined
 -- with the request's @Accept@ header, to encode the value for you
 -- (returning a status code of 200). If there was no @Accept@ header or it
--- was @*/*@, we return encode using the first @Content-Type@ type on the
+-- was @*\/\*@, we return encode using the first @Content-Type@ type on the
 -- list.
-instance ( AllCTRender ctypes a
+instance
-         ) => HasServer (Put ctypes a) where
+#if MIN_VERSION_base(4,8,0)
+         {-# OVERLAPPABLE #-}
+#endif
+         ( AllCTRender ctypes a) => HasServer (Put ctypes a) where
 
   type ServerT' (Put ctypes a) m = m a
 
@@ -457,7 +497,7 @@ instance ( AllCTRender ctypes a
         e <- runEitherT action
         respond $ case e of
           Right output -> do
-            let accH = fromMaybe "*/*" $ lookup hAccept $ requestHeaders request
+            let accH = fromMaybe ct_wildcard $ lookup hAccept $ requestHeaders request
             case handleAcceptH (Proxy :: Proxy ctypes) (AcceptHeader accH) output of
               Nothing -> failWith UnsupportedMediaType
               Just (contentT, body) -> succeedWith $
@@ -468,8 +508,14 @@ instance ( AllCTRender ctypes a
         respond $ failWith WrongMethod
     | otherwise = respond $ failWith NotFound
 
-instance HasServer (Put ctypes ()) where
+instance
+#if MIN_VERSION_base(4,8,0)
+         {-# OVERLAPPING #-}
+#endif
+         HasServer (Put ctypes ()) where
+
   type ServerT' (Put ctypes ()) m = m ()
+
   route Proxy action request respond
     | pathIsEmpty request && requestMethod request == methodPut = do
         e <- runEitherT action
@@ -482,14 +528,20 @@ instance HasServer (Put ctypes ()) where
     | otherwise = respond $ failWith NotFound
 
 -- Add response headers
-instance ( AllCTRender ctypes v ) => HasServer (Put ctypes (Headers h v)) where
+instance
+#if MIN_VERSION_base(4,8,0)
+         {-# OVERLAPPING #-}
+#endif
+         ( AllCTRender ctypes v ) => HasServer (Put ctypes (Headers h v)) where
+
   type ServerT' (Put ctypes (Headers h v)) m = m (Headers h v)
+
   route Proxy action request respond
     | pathIsEmpty request && requestMethod request == methodPut = do
       e <- runEitherT action
       respond $ case e of
         Right output -> do
-          let accH = fromMaybe "*/*" $ lookup hAccept $ requestHeaders request
+          let accH = fromMaybe ct_wildcard $ lookup hAccept $ requestHeaders request
               headers = getHeaders output
           case handleAcceptH (Proxy :: Proxy ctypes) (AcceptHeader accH) (getResponse output) of
             Nothing -> failWith UnsupportedMediaType
@@ -512,8 +564,12 @@ instance ( AllCTRender ctypes v ) => HasServer (Put ctypes (Headers h v)) where
 -- If successfully returning a value, we just require that its type has
 -- a 'ToJSON' instance and servant takes care of encoding it for you,
 -- yielding status code 200 along the way.
-instance ( AllCTRender ctypes a
+instance
-         ) => HasServer (Patch ctypes a) where
+#if MIN_VERSION_base(4,8,0)
+         {-# OVERLAPPABLE #-}
+#endif
+         ( AllCTRender ctypes a) => HasServer (Patch ctypes a) where
+
   type ServerT' (Patch ctypes a) m = m a
 
   route Proxy action request respond
@@ -521,7 +577,7 @@ instance ( AllCTRender ctypes a
         e <- runEitherT action
         respond $ case e of
           Right output -> do
-            let accH = fromMaybe "*/*" $ lookup hAccept $ requestHeaders request
+            let accH = fromMaybe ct_wildcard $ lookup hAccept $ requestHeaders request
             case handleAcceptH (Proxy :: Proxy ctypes) (AcceptHeader accH) output of
               Nothing -> failWith UnsupportedMediaType
               Just (contentT, body) -> succeedWith $
@@ -532,8 +588,14 @@ instance ( AllCTRender ctypes a
         respond $ failWith WrongMethod
     | otherwise = respond $ failWith NotFound
 
-instance HasServer (Patch ctypes ()) where
+instance
+#if MIN_VERSION_base(4,8,0)
+         {-# OVERLAPPING #-}
+#endif
+          HasServer (Patch ctypes ()) where
+
   type ServerT' (Patch ctypes ()) m = m ()
+
   route Proxy action request respond
     | pathIsEmpty request && requestMethod request == methodPatch = do
         e <- runEitherT action
@@ -546,14 +608,20 @@ instance HasServer (Patch ctypes ()) where
     | otherwise = respond $ failWith NotFound
 
 -- Add response headers
-instance ( AllCTRender ctypes v ) => HasServer (Patch ctypes (Headers h v)) where
+instance
+#if MIN_VERSION_base(4,8,0)
+         {-# OVERLAPPING #-}
+#endif
+         ( AllCTRender ctypes v ) => HasServer (Patch ctypes (Headers h v)) where
+
   type ServerT' (Patch ctypes (Headers h v)) m = m (Headers h v)
+
   route Proxy action request respond
     | pathIsEmpty request && requestMethod request == methodPatch = do
       e <- runEitherT action
       respond $ case e of
         Right outpatch -> do
-          let accH = fromMaybe "*/*" $ lookup hAccept $ requestHeaders request
+          let accH = fromMaybe ct_wildcard $ lookup hAccept $ requestHeaders request
               headers = getHeaders outpatch
           case handleAcceptH (Proxy :: Proxy ctypes) (AcceptHeader accH) (getResponse outpatch) of
             Nothing -> failWith UnsupportedMediaType
@@ -864,3 +932,6 @@ instance (KnownSymbol path, HasServer sublayout) => HasServer (path :> sublayout
     _ -> respond $ failWith NotFound
 
     where proxyPath = Proxy :: Proxy path
+
+ct_wildcard :: B.ByteString
+ct_wildcard = "*" <> "/" <> "*" -- Because CPP

servant/default.nix

@@ -1,12 +1,22 @@
-{ pkgs ? import <nixpkgs> { config.allowUnfree = true; }
+{ mkDerivation, aeson, attoparsec, base, bytestring
-, src ?  builtins.filterSource (path: type:
+, bytestring-conversion, case-insensitive, doctest, filemanip
-    type != "unknown" &&
+, hspec, http-media, http-types, network-uri, parsec, QuickCheck
-    baseNameOf path != ".git" &&
+, quickcheck-instances, stdenv, string-conversions, text, url
-    baseNameOf path != "result" &&
-    baseNameOf path != "dist") ./.
 }:
-pkgs.haskellPackages.buildLocalCabalWithArgs {
+mkDerivation {
-  name = "servant";
+  pname = "servant";
-  inherit src;
+  version = "0.2.2";
-  args = {};
+  src = ./.;
+  buildDepends = [
+    aeson attoparsec base bytestring bytestring-conversion
+    case-insensitive http-media http-types network-uri
+    string-conversions text
+  ];
+  testDepends = [
+    aeson attoparsec base bytestring doctest filemanip hspec parsec
+    QuickCheck quickcheck-instances string-conversions text url
+  ];
+  homepage = "http://haskell-servant.github.io/";
+  description = "A family of combinators for defining webservices APIs";
+  license = stdenv.lib.licenses.bsd3;
 }

servant/servant.cabal

@@ -8,6 +8,8 @@ description:
   .
   <https://github.com/haskell-servant/servant-server/blob/master/example/greet.hs Here>'s a runnable example, with comments, that defines a dummy API and
   implements a webserver that serves this API, using the <http://hackage.haskell.org/package/servant-server servant-server> package.
+  .
+  <https://github.com/haskell-servant/servant/blob/master/servant/CHANGELOG.md CHANGELOG>
 homepage:            http://haskell-servant.github.io/
 Bug-reports:         http://github.com/haskell-servant/servant/issues
 license:             BSD3
@@ -53,13 +55,12 @@ library
     , http-media >= 0.4 && < 0.7
     , http-types == 0.8.*
     , text >= 1 && < 2
-    , template-haskell >= 2.7 && < 2.10
-    , parsec >= 3.1
     , string-conversions >= 0.3 && < 0.4
     , network-uri >= 2.6
   hs-source-dirs: src
   default-language: Haskell2010
-  other-extensions: ConstraintKinds
+  other-extensions: CPP
+                  , ConstraintKinds
                   , DataKinds
                   , DeriveDataTypeable
                   , FlexibleInstances

servant/src/Servant/API/Alternative.hs

@@ -1,8 +1,11 @@
+{-# LANGUAGE CPP                #-}
 {-# LANGUAGE DeriveDataTypeable #-}
 {-# LANGUAGE TypeOperators      #-}
 module Servant.API.Alternative ((:<|>)(..)) where
 
+#if !MIN_VERSION_base(4,8,0)
 import           Data.Monoid   (Monoid (..))
+#endif
 import           Data.Typeable (Typeable)
 -- | Union of two APIs, first takes precedence in case of overlap.
 --

servant/src/Servant/API/ContentTypes.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP                   #-}
 {-# LANGUAGE ConstraintKinds       #-}
 {-# LANGUAGE DataKinds             #-}
 {-# LANGUAGE DeriveDataTypeable    #-}
@@ -63,7 +64,9 @@ module Servant.API.ContentTypes
     , eitherDecodeLenient
     ) where
 
+#if !MIN_VERSION_base(4,8,0)
 import           Control.Applicative        ((<*))
+#endif
 import           Control.Arrow              (left)
 import           Control.Monad
 import           Data.Aeson                 (FromJSON, ToJSON, Value,

servant/src/Servant/API/ResponseHeaders.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP                    #-}
 {-# LANGUAGE DataKinds              #-}
 {-# LANGUAGE DeriveFunctor          #-}
 {-# LANGUAGE FlexibleContexts       #-}
@@ -6,11 +7,13 @@
 {-# LANGUAGE GADTs                  #-}
 {-# LANGUAGE KindSignatures         #-}
 {-# LANGUAGE MultiParamTypeClasses  #-}
-{-# LANGUAGE OverlappingInstances   #-}
 {-# LANGUAGE PolyKinds              #-}
 {-# LANGUAGE ScopedTypeVariables    #-}
 {-# LANGUAGE TypeOperators          #-}
 {-# LANGUAGE UndecidableInstances   #-}
+#if !MIN_VERSION_base(4,8,0)
+{-# LANGUAGE OverlappingInstances   #-}
+#endif
 
 -- | This module provides facilities for adding headers to a response.
 --
@@ -50,13 +53,21 @@ class AddHeader h v orig new
     | h v orig -> new, new -> h, new -> v, new -> orig where
   addHeader :: v -> orig -> new
 
-instance ( KnownSymbol h, ToByteString v
+instance
+#if MIN_VERSION_base(4,8,0)
+         {-# OVERLAPPING #-}
+#endif
+         ( KnownSymbol h, ToByteString v
          ) => AddHeader h v (Headers (fst ': rest)  a) (Headers (Header h v ': fst ': rest) a) where
     addHeader a (Headers resp heads) = Headers resp ((headerName, toByteString' a) : heads)
       where
         headerName = CI.mk . pack $ symbolVal (Proxy :: Proxy h)
 
-instance ( KnownSymbol h, ToByteString v
+instance
+#if MIN_VERSION_base(4,8,0)
+         {-# OVERLAPPABLE #-}
+#endif
+         ( KnownSymbol h, ToByteString v
          , new ~ (Headers '[Header h v] a)
          ) => AddHeader h v a new where
     addHeader a resp = Headers resp [(headerName, toByteString' a)]

servant/src/Servant/Common/Text.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP                  #-}
 {-# LANGUAGE FlexibleInstances    #-}
 {-# LANGUAGE OverloadedStrings    #-}
 {-# LANGUAGE TypeSynonymInstances #-}
@@ -6,12 +7,18 @@ module Servant.Common.Text
   , ToText(..)
   ) where
 
+#if !MIN_VERSION_base(4,8,0)
 import           Control.Applicative     ((<$>))
+#endif
 import           Data.Int                (Int16, Int32, Int64, Int8)
 import           Data.String.Conversions (cs)
 import           Data.Text               (Text)
 import           Data.Text.Read          (Reader, decimal, rational, signed)
-import           Data.Word               (Word, Word16, Word32, Word64, Word8)
+import           Data.Word               (Word16, Word32, Word64, Word8
+#if !MIN_VERSION_base(4,8,0)
+        , Word
+#endif
+        )
 
 -- | For getting values from url captures and query string parameters
 -- Instances should obey:

servant/src/Servant/Utils/Links.hs

@@ -1,4 +1,4 @@
-{-# LANGUAGE PolyKinds #-}
+{-# LANGUAGE CPP                    #-}
 {-# LANGUAGE ConstraintKinds        #-}
 {-# LANGUAGE DataKinds              #-}
 {-# LANGUAGE FlexibleInstances      #-}
@@ -104,7 +104,11 @@ module Servant.Utils.Links (
 import Data.List
 import Data.Proxy ( Proxy(..) )
 import Data.Text (Text, unpack)
+#if !MIN_VERSION_base(4,8,0)
 import Data.Monoid ( Monoid(..), (<>) )
+#else
+import Data.Monoid ( (<>) )
+#endif
 import Network.URI ( URI(..), escapeURIString, isUnreserved )
 import GHC.TypeLits ( KnownSymbol, symbolVal )
 import GHC.Exts(Constraint)

servant/test/Servant/API/ContentTypesSpec.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP                   #-}
 {-# LANGUAGE DataKinds             #-}
 {-# LANGUAGE DeriveGeneric         #-}
 {-# LANGUAGE MultiParamTypeClasses #-}
@@ -5,7 +6,9 @@
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 module Servant.API.ContentTypesSpec where
 
+#if !MIN_VERSION_base(4,8,0)
 import           Control.Applicative
+#endif
 import           Control.Arrow
 import           Data.Aeson
 import           Data.Aeson.Parser          (jstring)

servant/test/Servant/Common/TextSpec.hs

@@ -1,8 +1,13 @@
+{-# LANGUAGE CPP #-}
 module Servant.Common.TextSpec where
 
 import           Data.Int                  (Int16, Int32, Int64, Int8)
 import           Data.Text                 (Text)
-import           Data.Word                 (Word, Word16, Word32, Word64, Word8)
+import           Data.Word                 (Word16, Word32, Word64, Word8
+#if !MIN_VERSION_base(4,8,0)
+                 , Word
+#endif
+                 )
 import           Servant.Common.Text
 import           Test.Hspec
 import           Test.QuickCheck

sources.txt

@@ -0,0 +1,5 @@
+servant
+servant-client
+servant-docs
+servant-jquery
+servant-server