eeva/servant
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix some build errors on 7.8/7.10

Browse source
This commit is contained in:
Alp Mestanogullari 2015-08-10 11:11:11 +02:00 committed by aaron levin
parent 842dc1d934
commit c7caebad59
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
servant-server/src/Servant/Server/Internal.hs
View file

@ -23,7 +23,7 @@ module Servant.Server.Internal
) where ) where
#if !MIN_VERSION_base(4,8,0) #if !MIN_VERSION_base(4,8,0)
import Control.Applicative ((<$>)) import Control.Applicative ((<$>), pure)
#endif #endif
import Control.Monad.Trans.Except (ExceptT) import Control.Monad.Trans.Except (ExceptT)
import qualified Data.ByteString as B import qualified Data.ByteString as B

5
servant-server/src/Servant/Server/Internal/Authentication.hs
View file

@ -1,3 +1,4 @@
{-# LANGUAGE CPP #-}
{-# LANGUAGE DataKinds #-} {-# LANGUAGE DataKinds #-}
{-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE ScopedTypeVariables #-}
@ -16,7 +17,11 @@ module Servant.Server.Internal.Authentication
import Control.Monad (guard) import Control.Monad (guard)
import qualified Data.ByteString as B import qualified Data.ByteString as B
import Data.ByteString.Base64 (decodeLenient) import Data.ByteString.Base64 (decodeLenient)
#if !MIN_VERSION_base(4,8,0)
import Data.Monoid ((<>), mempty) import Data.Monoid ((<>), mempty)
#else
import Data.Monoid ((<>))
#endif
import Data.Proxy (Proxy (Proxy)) import Data.Proxy (Proxy (Proxy))
import Data.String (fromString) import Data.String (fromString)
import Data.Word8 (isSpace, toLower, _colon) import Data.Word8 (isSpace, toLower, _colon)