[arch-commits] Commit in postgrest/trunk (PKGBUILD protolude-0.3.1.patch)
Felix Yan
felixonmars at gemini.archlinux.org
Sun Jul 10 21:40:18 UTC 2022
Date: Sunday, July 10, 2022 @ 21:40:18
Author: felixonmars
Revision: 1249340
upgpkg: postgrest 9.0.0-1
Modified:
postgrest/trunk/PKGBUILD
postgrest/trunk/protolude-0.3.1.patch
-----------------------+
PKGBUILD | 17 ++++----
protolude-0.3.1.patch | 96 ++++++++++--------------------------------------
2 files changed, 30 insertions(+), 83 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2022-07-10 19:28:19 UTC (rev 1249339)
+++ PKGBUILD 2022-07-10 21:40:18 UTC (rev 1249340)
@@ -2,8 +2,8 @@
# Contributor: Arch Haskell Team <arch-haskell at haskell.org>
pkgname=postgrest
-pkgver=8.0.0
-pkgrel=236
+pkgver=9.0.0
+pkgrel=1
pkgdesc="REST API for any Postgres database"
url="https://github.com/begriffs/postgrest"
license=("MIT")
@@ -20,20 +20,21 @@
'haskell-swagger2' 'haskell-unordered-containers' 'haskell-vector' 'haskell-wai'
'haskell-wai-cors' 'haskell-wai-extra' 'haskell-wai-logger' 'haskell-wai-middleware-static'
'haskell-auto-update' 'haskell-retry' 'haskell-warp')
-makedepends=('ghc' 'uusi' 'haskell-aeson-qq' 'haskell-async' 'haskell-hspec' 'haskell-hspec-wai'
- 'haskell-hspec-wai-json' 'haskell-monad-control' 'haskell-transformers-base')
+makedepends=('ghc' 'uusi' 'haskell-aeson-qq' 'haskell-async' 'haskell-doctest' 'haskell-hspec'
+ 'haskell-hspec-wai' 'haskell-hspec-wai-json' 'haskell-monad-control'
+ 'haskell-pretty-simple' 'haskell-transformers-base')
checkdepends=('pifpaf' 'postgresql' 'procps-ng')
source=("https://github.com/begriffs/postgrest/archive/v$pkgver/$pkgname-$pkgver.tar.gz"
protolude-0.3.1.patch)
-sha512sums=('ae3f004d3042e236ffd3870c980cdfbb615a3de5433bd917816e8c0e719edb0bfcba763bb3c920dad64461410374231a6ab7710d48b310cdc30d5dd6f1f58337'
- '29132a1f8d432f02177dc42c2044cb8e707978372956830c490984295f4ebcff7256ef119006204e97b7d57fcf80054d5d3ed2ad65746653f2685158e333e67e')
+sha512sums=('28f6828cc47d295e37c06aa845b14de71f87fdd1380ece04ba928b8301be2ee9561e0ae4edf78025780cf0d3512ba2694fdcd1df0d05e31fa0e704384aa4717b'
+ 'eeac3a9bc7547482539c14e87c08bafa8bb4acb5863286613af3af93ff1f55c7e7c6c8c18f222b0b7c1d8ecb67eac4c5cdbc0c69e885f7716014b7cb5b1d7d23')
prepare() {
cd $pkgname-$pkgver
- uusi -u base -u hasql -u hasql-pool -u hspec -u HTTP -u lens -u retry $pkgname.cabal
+ uusi -u hasql -u hasql-pool -u hspec -u HTTP -u lens $pkgname.cabal
# TODO: not a proper fix. probably newly added "column" should be shown too
- sed -i 's/H.RowError i/H.RowError i _/' src/PostgREST/Error.hs
+ sed -i 's/SQL.RowError i/SQL.RowError i _/' src/PostgREST/Error.hs
patch -p1 -i ../protolude-0.3.1.patch
}
Modified: protolude-0.3.1.patch
===================================================================
--- protolude-0.3.1.patch 2022-07-10 19:28:19 UTC (rev 1249339)
+++ protolude-0.3.1.patch 2022-07-10 21:40:18 UTC (rev 1249340)
@@ -1,22 +1,28 @@
-From 47b13f4c99e89c958ed817cc2df56f46599f54a8 Mon Sep 17 00:00:00 2001
+From de142b535530541476b73882f6ef5bdf3b73b76b Mon Sep 17 00:00:00 2001
From: Laurence Isla <lau.isla.c at gmail.com>
-Date: Mon, 6 Jun 2022 21:25:11 -0500
-Subject: [PATCH 1/3] Fix Config.hs cabal build
+Date: Wed, 8 Jun 2022 11:41:39 -0500
+Subject: [PATCH] Upgrade protolude to 0.3.1
---
- src/PostgREST/Config.hs | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
+ nix/overlays/haskell-packages.nix | 9 +++++++++
+ postgrest.cabal | 10 +++++-----
+ src/PostgREST/Config.hs | 6 +++---
+ src/PostgREST/Request/ApiRequest.hs | 4 ++--
+ src/PostgREST/Request/DbRequestBuilder.hs | 2 +-
+ stack.yaml | 1 +
+ stack.yaml.lock | 24 ++++++++++++++++++-----
+ 7 files changed, 40 insertions(+), 16 deletions(-)
diff --git a/src/PostgREST/Config.hs b/src/PostgREST/Config.hs
-index 9dbd08529..3fd9e6245 100644
+index d5d63cd92..06ed39d25 100644
--- a/src/PostgREST/Config.hs
+++ b/src/PostgREST/Config.hs
-@@ -359,17 +359,17 @@ parser optPath env dbSettings =
+@@ -369,17 +369,17 @@ parser optPath env dbSettings =
coerceInt :: (Read i, Integral i) => C.Value -> Maybe i
coerceInt (C.Number x) = rightToMaybe $ floatingOrInteger x
- coerceInt (C.String x) = readMaybe $ toS x
-+ coerceInt (C.String x) = readMaybe (toS x :: [Char])
++ coerceInt (C.String x) = readMaybe x
coerceInt _ = Nothing
coerceBool :: C.Value -> Maybe Bool
@@ -24,85 +30,25 @@
coerceBool (C.String s) =
-- parse all kinds of text: True, true, TRUE, "true", ...
- case readMaybe . toS $ T.toTitle $ T.filter isAlpha $ toS s of
-+ case readMaybe (toS $ T.toTitle $ T.filter isAlpha $ toS s :: [Char]) of
++ case readMaybe $ T.toTitle $ T.filter isAlpha $ toS s of
Just b -> Just b
-- numeric instead?
- Nothing -> (> 0) <$> (readMaybe $ toS s :: Maybe Integer)
-+ Nothing -> (> 0) <$> (readMaybe (toS s :: [Char]) :: Maybe Integer)
- coerceBool _ = Nothing
-
- splitOnCommas :: C.Value -> [Text]
-
-From ee86d0d2a8d71e294531dd2d3410fe8facf3c873 Mon Sep 17 00:00:00 2001
-From: Laurence Isla <lau.isla.c at gmail.com>
-Date: Tue, 7 Jun 2022 18:11:46 -0500
-Subject: [PATCH 2/3] Upgrade protolude to 0.3.1
-
----
- nix/overlays/haskell-packages.nix | 9 +++++++++
- postgrest.cabal | 10 +++++-----
- src/PostgREST/Config.hs | 6 +++---
- src/PostgREST/Request/QueryParams.hs | 4 ++--
- stack.yaml | 1 +
- 5 files changed, 20 insertions(+), 10 deletions(-)
-
-diff --git a/src/PostgREST/Config.hs b/src/PostgREST/Config.hs
-index 3fd9e6245..a623ed264 100644
---- a/src/PostgREST/Config.hs
-+++ b/src/PostgREST/Config.hs
-@@ -359,17 +359,17 @@ parser optPath env dbSettings =
-
- coerceInt :: (Read i, Integral i) => C.Value -> Maybe i
- coerceInt (C.Number x) = rightToMaybe $ floatingOrInteger x
-- coerceInt (C.String x) = readMaybe (toS x :: [Char])
-+ coerceInt (C.String x) = readMaybe x
- coerceInt _ = Nothing
-
- coerceBool :: C.Value -> Maybe Bool
- coerceBool (C.Bool b) = Just b
- coerceBool (C.String s) =
- -- parse all kinds of text: True, true, TRUE, "true", ...
-- case readMaybe (toS $ T.toTitle $ T.filter isAlpha $ toS s :: [Char]) of
-+ case readMaybe $ T.toTitle $ T.filter isAlpha $ toS s of
- Just b -> Just b
- -- numeric instead?
-- Nothing -> (> 0) <$> (readMaybe (toS s :: [Char]) :: Maybe Integer)
+ Nothing -> (> 0) <$> (readMaybe s :: Maybe Integer)
coerceBool _ = Nothing
splitOnCommas :: C.Value -> [Text]
-diff --git a/src/PostgREST/RangeQuery.hs b/src/PostgREST/RangeQuery.hs
-index 8e77146..8d4a46a 100644
---- a/src/PostgREST/RangeQuery.hs
-+++ b/src/PostgREST/RangeQuery.hs
-@@ -27,7 +27,6 @@ import Network.HTTP.Types.Header
- import Network.HTTP.Types.Status
-
- import Protolude hiding (toS)
--import Protolude.Conv (toS)
-
- type NonnegRange = Range Integer
-
-@@ -37,7 +36,7 @@ rangeParse range = do
-
- case listToMaybe (range =~ rangeRegex :: [[BS.ByteString]]) of
- Just parsedRange ->
-- let [_, mLower, mUpper] = readMaybe . toS <$> parsedRange
-+ let [_, mLower, mUpper] = readMaybe <$> parsedRange
- lower = maybe emptyRange rangeGeq mLower
- upper = maybe allRange rangeLeq mUpper in
- rangeIntersection lower upper
diff --git a/src/PostgREST/Request/ApiRequest.hs b/src/PostgREST/Request/ApiRequest.hs
-index dbf73bf..c3ff6db 100644
+index 00e076d1b..439a08aca 100644
--- a/src/PostgREST/Request/ApiRequest.hs
+++ b/src/PostgREST/Request/ApiRequest.hs
-@@ -377,9 +377,9 @@ userApiRequest conf at AppConfig{..} dbStructure req reqBody
+@@ -364,9 +364,9 @@ userApiRequest conf at AppConfig{..} dbStructure req reqBody
headerRange = rangeRequested hdrs
replaceLast x s = T.intercalate "." $ L.init (T.split (=='.') s) ++ [x]
- limitParams :: M.HashMap ByteString NonnegRange
+ limitParams :: M.HashMap Text NonnegRange
- limitParams = M.fromList [(toS (replaceLast "limit" k), restrictRange (readMaybe . toS =<< v) allRange) | (k,v) <- qParams, isJust v, endingIn ["limit"] k]
+ limitParams = M.fromList [(toS (replaceLast "limit" k), restrictRange (readMaybe =<< v) allRange) | (k,v) <- qParams, isJust v, endingIn ["limit"] k]
- offsetParams :: M.HashMap ByteString NonnegRange
+ offsetParams :: M.HashMap Text NonnegRange
- offsetParams = M.fromList [(toS (replaceLast "limit" k), maybe allRange rangeGeq (readMaybe . toS =<< v)) | (k,v) <- qParams, isJust v, endingIn ["offset"] k]
+ offsetParams = M.fromList [(toS (replaceLast "limit" k), maybe allRange rangeGeq (readMaybe =<< v)) | (k,v) <- qParams, isJust v, endingIn ["offset"] k]
@@ -109,10 +55,10 @@
urlRange = M.unionWith f limitParams offsetParams
where
diff --git a/src/PostgREST/Request/DbRequestBuilder.hs b/src/PostgREST/Request/DbRequestBuilder.hs
-index abd44c3..489cc4e 100644
+index 35af9962d..88819079d 100644
--- a/src/PostgREST/Request/DbRequestBuilder.hs
+++ b/src/PostgREST/Request/DbRequestBuilder.hs
-@@ -53,7 +53,7 @@ import PostgREST.Request.Types
+@@ -56,7 +56,7 @@ import PostgREST.Request.Types
import qualified PostgREST.DbStructure.Relationship as Relationship
More information about the arch-commits
mailing list