Fix compatibility with protolude-0.2 (#939)

This allows the Arch Linux PostgREST package to build cleanly
This commit is contained in:
Felix Yan
2017-08-14 01:36:33 -05:00
committed by Joe Nelson
parent d89937a6f3
commit 69070b64f9
6 changed files with 8 additions and 7 deletions
+1 -1
View File
@@ -11,7 +11,7 @@ import PostgREST.DbStructure (getDbStructure)
import PostgREST.Error (encodeError)
import PostgREST.OpenAPI (isMalformedProxyUri)
import PostgREST.Types (DbStructure, Schema)
import Protolude
import Protolude hiding (replace, hPutStrLn)
import Control.Retry (RetryStatus, capDelay,
exponentialBackoff,
+1 -1
View File
@@ -72,7 +72,7 @@ library
, network-uri
, optparse-applicative >= 0.13 && < 0.14
, parsec
, protolude
, protolude >= 0.2
, Ranged-sets == 0.3.0
, regex-tdfa
, safe
+1 -1
View File
@@ -45,7 +45,7 @@ import System.IO (hPrint)
import Text.Heredoc
import Text.PrettyPrint.ANSI.Leijen hiding ((<>), (<$>))
import qualified Text.PrettyPrint.ANSI.Leijen as L
import Protolude hiding (intercalate, (<>))
import Protolude hiding (intercalate, (<>), hPutStrLn)
-- | Config file settings for the server
data AppConfig = AppConfig {
+3 -3
View File
@@ -1,6 +1,6 @@
module PostgREST.Parsers where
import Protolude hiding (try, intercalate)
import Protolude hiding (try, intercalate, replace)
import Control.Monad ((>>))
import Data.Foldable (foldl1)
import qualified Data.HashMap.Strict as M
@@ -114,7 +114,7 @@ pRelationSelect = lexeme $ try ( do
alias <- optionMaybe ( try(pFieldName <* aliasSeparator) )
fld <- pField
relationDetail <- optionMaybe ( try( char '.' *> pFieldName ) )
return (fld, Nothing, alias, relationDetail)
)
@@ -184,7 +184,7 @@ pLogicTree = Stmnt <$> try pLogicFilter
pLogicFilter :: Parser Filter
pLogicFilter = Filter <$> pField <* pDelimiter <*> pOperation pLogicVText pLogicVTextL
pNot :: Parser Bool
pNot = try (string "not" *> pDelimiter *> pure True)
pNot = try (string "not" *> pDelimiter *> pure True)
<|> pure False
<?> "negation operator (not)"
pLogicOp :: Parser LogicOperator
+1 -1
View File
@@ -47,7 +47,7 @@ import Data.Scientific ( FPFormat (..)
, formatScientific
, isInteger
)
import Protolude hiding (from, intercalate, ord, cast)
import Protolude hiding (from, intercalate, ord, cast, replace)
import PostgREST.ApiRequest (PreferRepresentation (..))
{-| The generic query result format used by API responses. The location header
+1
View File
@@ -7,6 +7,7 @@ extra-deps:
- hjsonschema-1.5.0.1
- jose-0.5.0.3
- Ranged-sets-0.3.0
- protolude-0.2
ghc-options:
postgrest: -O2 -Werror -Wall -fwarn-identities -fno-warn-redundant-constraints
nix: