[arch-commits] Commit in postgrest/repos (6 files)
Felix Yan
felixonmars at archlinux.org
Thu Oct 19 17:21:24 UTC 2017
Date: Thursday, October 19, 2017 @ 17:21:23
Author: felixonmars
Revision: 263662
archrelease: copy trunk to community-staging-i686, community-staging-x86_64
Added:
postgrest/repos/community-staging-i686/
postgrest/repos/community-staging-i686/PKGBUILD
(from rev 263661, postgrest/trunk/PKGBUILD)
postgrest/repos/community-staging-i686/protolude-0.2.patch
(from rev 263661, postgrest/trunk/protolude-0.2.patch)
postgrest/repos/community-staging-x86_64/
postgrest/repos/community-staging-x86_64/PKGBUILD
(from rev 263661, postgrest/trunk/PKGBUILD)
postgrest/repos/community-staging-x86_64/protolude-0.2.patch
(from rev 263661, postgrest/trunk/protolude-0.2.patch)
----------------------------------------------+
community-staging-i686/PKGBUILD | 57 ++++++++++++++++++++
community-staging-i686/protolude-0.2.patch | 70 +++++++++++++++++++++++++
community-staging-x86_64/PKGBUILD | 57 ++++++++++++++++++++
community-staging-x86_64/protolude-0.2.patch | 70 +++++++++++++++++++++++++
4 files changed, 254 insertions(+)
Copied: postgrest/repos/community-staging-i686/PKGBUILD (from rev 263661, postgrest/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2017-10-19 17:21:23 UTC (rev 263662)
@@ -0,0 +1,57 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Arch Haskell Team <arch-haskell at haskell.org>
+
+pkgname=postgrest
+pkgver=0.4.2.0
+pkgrel=22
+pkgdesc="REST API for any Postgres database"
+url="https://github.com/begriffs/postgrest"
+license=("MIT")
+arch=('i686' 'x86_64')
+depends=('ghc-libs' "haskell-auto-update" "haskell-hasql" "haskell-hasql-pool" "haskell-protolude"
+ "haskell-text" "haskell-warp" "haskell-base64-bytestring" "haskell-retry" "haskell-aeson"
+ "haskell-ansi-wl-pprint" "haskell-case-insensitive" "haskell-cassava"
+ "haskell-configurator-ng" "haskell-contravariant" "haskell-either"
+ "haskell-hasql-transaction" "haskell-heredoc" "haskell-http" "haskell-http-types"
+ "haskell-insert-ordered-containers" "haskell-interpolatedstring-perl6" "haskell-jwt"
+ "haskell-lens" "haskell-lens-aeson" "haskell-network-uri" "haskell-optparse-applicative"
+ "haskell-parsec" "haskell-ranged-sets" "haskell-regex-tdfa" "haskell-safe"
+ "haskell-scientific" "haskell-swagger2" "haskell-unordered-containers" "haskell-vector"
+ "haskell-wai" "haskell-wai-cors" "haskell-wai-extra" "haskell-wai-middleware-static"
+ "haskell-cookie")
+makedepends=('ghc')
+source=("https://hackage.haskell.org/packages/archive/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz"
+ protolude-0.2.patch)
+sha256sums=('15b0902c2318e44bcf2d2c1cd654abc8acbbe00a9794e5ad821ab09eb0aca608'
+ '8b2eb2a999dba5bfc1953926e170c2ff5086efed75a038923249840d5370f9a6')
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -p1 -i ../protolude-0.2.patch
+ sed -i 's/, optparse-applicative >= 0.13 && < 0.14/, optparse-applicative >= 0.13/' ${pkgname}.cabal
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ runhaskell Setup configure -O --enable-shared --enable-executable-dynamic --disable-library-vanilla \
+ --prefix=/usr --docdir="/usr/share/doc/${pkgname}" \
+ --dynlibdir=/usr/lib --libsubdir=\$compiler/site-local/\$pkgid \
+ -f-CI
+ runhaskell Setup build
+ runhaskell Setup register --gen-script
+ runhaskell Setup unregister --gen-script
+ sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+ sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ install -D -m744 register.sh "${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+ install -D -m744 unregister.sh "${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+ runhaskell Setup copy --destdir="${pkgdir}"
+ install -D -m644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+ rm -f "${pkgdir}/usr/share/doc/${pkgname}/LICENSE"
+}
Copied: postgrest/repos/community-staging-i686/protolude-0.2.patch (from rev 263661, postgrest/trunk/protolude-0.2.patch)
===================================================================
--- community-staging-i686/protolude-0.2.patch (rev 0)
+++ community-staging-i686/protolude-0.2.patch 2017-10-19 17:21:23 UTC (rev 263662)
@@ -0,0 +1,70 @@
+commit 96f1c00cfb5b92419e188248c6e672dc10990d9e
+Author: Felix Yan <felixonmars at archlinux.org>
+Date: Mon Aug 14 09:14:08 2017 +0800
+
+ Fix compatibility with protolude-0.2
+
+diff --git a/main/Main.hs b/main/Main.hs
+index 902195e..cbe5a9f 100644
+--- a/main/Main.hs
++++ b/main/Main.hs
+@@ -11,7 +11,7 @@ import PostgREST.DbStructure (getDbStructure)
+
+ module Main where
+
+-import Protolude
++import Protolude hiding (replace, hPutStrLn)
+ import PostgREST.App
+ import PostgREST.Config (AppConfig (..),
+ PgVersion (..),
+diff --git a/postgrest.cabal b/postgrest.cabal
+index e727116..ce97ff2 100644
+--- a/postgrest.cabal
++++ b/postgrest.cabal
+@@ -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
+diff --git a/src/PostgREST/Config.hs b/src/PostgREST/Config.hs
+index 9c7bd5d..d7dd680 100644
+--- a/src/PostgREST/Config.hs
++++ b/src/PostgREST/Config.hs
+@@ -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 {
+diff --git a/src/PostgREST/Parsers.hs b/src/PostgREST/Parsers.hs
+index e71abf5..0168603 100644
+--- a/src/PostgREST/Parsers.hs
++++ b/src/PostgREST/Parsers.hs
+@@ -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
+diff --git a/src/PostgREST/QueryBuilder.hs b/src/PostgREST/QueryBuilder.hs
+index 4533b68..05dbe0d 100644
+--- a/src/PostgREST/QueryBuilder.hs
++++ b/src/PostgREST/QueryBuilder.hs
+@@ -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
Copied: postgrest/repos/community-staging-x86_64/PKGBUILD (from rev 263661, postgrest/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2017-10-19 17:21:23 UTC (rev 263662)
@@ -0,0 +1,57 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Arch Haskell Team <arch-haskell at haskell.org>
+
+pkgname=postgrest
+pkgver=0.4.2.0
+pkgrel=22
+pkgdesc="REST API for any Postgres database"
+url="https://github.com/begriffs/postgrest"
+license=("MIT")
+arch=('i686' 'x86_64')
+depends=('ghc-libs' "haskell-auto-update" "haskell-hasql" "haskell-hasql-pool" "haskell-protolude"
+ "haskell-text" "haskell-warp" "haskell-base64-bytestring" "haskell-retry" "haskell-aeson"
+ "haskell-ansi-wl-pprint" "haskell-case-insensitive" "haskell-cassava"
+ "haskell-configurator-ng" "haskell-contravariant" "haskell-either"
+ "haskell-hasql-transaction" "haskell-heredoc" "haskell-http" "haskell-http-types"
+ "haskell-insert-ordered-containers" "haskell-interpolatedstring-perl6" "haskell-jwt"
+ "haskell-lens" "haskell-lens-aeson" "haskell-network-uri" "haskell-optparse-applicative"
+ "haskell-parsec" "haskell-ranged-sets" "haskell-regex-tdfa" "haskell-safe"
+ "haskell-scientific" "haskell-swagger2" "haskell-unordered-containers" "haskell-vector"
+ "haskell-wai" "haskell-wai-cors" "haskell-wai-extra" "haskell-wai-middleware-static"
+ "haskell-cookie")
+makedepends=('ghc')
+source=("https://hackage.haskell.org/packages/archive/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz"
+ protolude-0.2.patch)
+sha256sums=('15b0902c2318e44bcf2d2c1cd654abc8acbbe00a9794e5ad821ab09eb0aca608'
+ '8b2eb2a999dba5bfc1953926e170c2ff5086efed75a038923249840d5370f9a6')
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -p1 -i ../protolude-0.2.patch
+ sed -i 's/, optparse-applicative >= 0.13 && < 0.14/, optparse-applicative >= 0.13/' ${pkgname}.cabal
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ runhaskell Setup configure -O --enable-shared --enable-executable-dynamic --disable-library-vanilla \
+ --prefix=/usr --docdir="/usr/share/doc/${pkgname}" \
+ --dynlibdir=/usr/lib --libsubdir=\$compiler/site-local/\$pkgid \
+ -f-CI
+ runhaskell Setup build
+ runhaskell Setup register --gen-script
+ runhaskell Setup unregister --gen-script
+ sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+ sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ install -D -m744 register.sh "${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+ install -D -m744 unregister.sh "${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+ runhaskell Setup copy --destdir="${pkgdir}"
+ install -D -m644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+ rm -f "${pkgdir}/usr/share/doc/${pkgname}/LICENSE"
+}
Copied: postgrest/repos/community-staging-x86_64/protolude-0.2.patch (from rev 263661, postgrest/trunk/protolude-0.2.patch)
===================================================================
--- community-staging-x86_64/protolude-0.2.patch (rev 0)
+++ community-staging-x86_64/protolude-0.2.patch 2017-10-19 17:21:23 UTC (rev 263662)
@@ -0,0 +1,70 @@
+commit 96f1c00cfb5b92419e188248c6e672dc10990d9e
+Author: Felix Yan <felixonmars at archlinux.org>
+Date: Mon Aug 14 09:14:08 2017 +0800
+
+ Fix compatibility with protolude-0.2
+
+diff --git a/main/Main.hs b/main/Main.hs
+index 902195e..cbe5a9f 100644
+--- a/main/Main.hs
++++ b/main/Main.hs
+@@ -11,7 +11,7 @@ import PostgREST.DbStructure (getDbStructure)
+
+ module Main where
+
+-import Protolude
++import Protolude hiding (replace, hPutStrLn)
+ import PostgREST.App
+ import PostgREST.Config (AppConfig (..),
+ PgVersion (..),
+diff --git a/postgrest.cabal b/postgrest.cabal
+index e727116..ce97ff2 100644
+--- a/postgrest.cabal
++++ b/postgrest.cabal
+@@ -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
+diff --git a/src/PostgREST/Config.hs b/src/PostgREST/Config.hs
+index 9c7bd5d..d7dd680 100644
+--- a/src/PostgREST/Config.hs
++++ b/src/PostgREST/Config.hs
+@@ -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 {
+diff --git a/src/PostgREST/Parsers.hs b/src/PostgREST/Parsers.hs
+index e71abf5..0168603 100644
+--- a/src/PostgREST/Parsers.hs
++++ b/src/PostgREST/Parsers.hs
+@@ -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
+diff --git a/src/PostgREST/QueryBuilder.hs b/src/PostgREST/QueryBuilder.hs
+index 4533b68..05dbe0d 100644
+--- a/src/PostgREST/QueryBuilder.hs
++++ b/src/PostgREST/QueryBuilder.hs
+@@ -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
More information about the arch-commits
mailing list