Fix compatibility with protolude-0.2 (#939)
This allows the Arch Linux PostgREST package to build cleanly
This commit is contained in:
+1
-1
@@ -11,7 +11,7 @@ import PostgREST.DbStructure (getDbStructure)
|
|||||||
import PostgREST.Error (encodeError)
|
import PostgREST.Error (encodeError)
|
||||||
import PostgREST.OpenAPI (isMalformedProxyUri)
|
import PostgREST.OpenAPI (isMalformedProxyUri)
|
||||||
import PostgREST.Types (DbStructure, Schema)
|
import PostgREST.Types (DbStructure, Schema)
|
||||||
import Protolude
|
import Protolude hiding (replace, hPutStrLn)
|
||||||
|
|
||||||
import Control.Retry (RetryStatus, capDelay,
|
import Control.Retry (RetryStatus, capDelay,
|
||||||
exponentialBackoff,
|
exponentialBackoff,
|
||||||
|
|||||||
+1
-1
@@ -72,7 +72,7 @@ library
|
|||||||
, network-uri
|
, network-uri
|
||||||
, optparse-applicative >= 0.13 && < 0.14
|
, optparse-applicative >= 0.13 && < 0.14
|
||||||
, parsec
|
, parsec
|
||||||
, protolude
|
, protolude >= 0.2
|
||||||
, Ranged-sets == 0.3.0
|
, Ranged-sets == 0.3.0
|
||||||
, regex-tdfa
|
, regex-tdfa
|
||||||
, safe
|
, safe
|
||||||
|
|||||||
@@ -45,7 +45,7 @@ import System.IO (hPrint)
|
|||||||
import Text.Heredoc
|
import Text.Heredoc
|
||||||
import Text.PrettyPrint.ANSI.Leijen hiding ((<>), (<$>))
|
import Text.PrettyPrint.ANSI.Leijen hiding ((<>), (<$>))
|
||||||
import qualified Text.PrettyPrint.ANSI.Leijen as L
|
import qualified Text.PrettyPrint.ANSI.Leijen as L
|
||||||
import Protolude hiding (intercalate, (<>))
|
import Protolude hiding (intercalate, (<>), hPutStrLn)
|
||||||
|
|
||||||
-- | Config file settings for the server
|
-- | Config file settings for the server
|
||||||
data AppConfig = AppConfig {
|
data AppConfig = AppConfig {
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
module PostgREST.Parsers where
|
module PostgREST.Parsers where
|
||||||
|
|
||||||
import Protolude hiding (try, intercalate)
|
import Protolude hiding (try, intercalate, replace)
|
||||||
import Control.Monad ((>>))
|
import Control.Monad ((>>))
|
||||||
import Data.Foldable (foldl1)
|
import Data.Foldable (foldl1)
|
||||||
import qualified Data.HashMap.Strict as M
|
import qualified Data.HashMap.Strict as M
|
||||||
|
|||||||
@@ -47,7 +47,7 @@ import Data.Scientific ( FPFormat (..)
|
|||||||
, formatScientific
|
, formatScientific
|
||||||
, isInteger
|
, isInteger
|
||||||
)
|
)
|
||||||
import Protolude hiding (from, intercalate, ord, cast)
|
import Protolude hiding (from, intercalate, ord, cast, replace)
|
||||||
import PostgREST.ApiRequest (PreferRepresentation (..))
|
import PostgREST.ApiRequest (PreferRepresentation (..))
|
||||||
|
|
||||||
{-| The generic query result format used by API responses. The location header
|
{-| The generic query result format used by API responses. The location header
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ extra-deps:
|
|||||||
- hjsonschema-1.5.0.1
|
- hjsonschema-1.5.0.1
|
||||||
- jose-0.5.0.3
|
- jose-0.5.0.3
|
||||||
- Ranged-sets-0.3.0
|
- Ranged-sets-0.3.0
|
||||||
|
- protolude-0.2
|
||||||
ghc-options:
|
ghc-options:
|
||||||
postgrest: -O2 -Werror -Wall -fwarn-identities -fno-warn-redundant-constraints
|
postgrest: -O2 -Werror -Wall -fwarn-identities -fno-warn-redundant-constraints
|
||||||
nix:
|
nix:
|
||||||
|
|||||||
Reference in New Issue
Block a user