[arch-commits] Commit in promscale_extension/trunk (PKGBUILD)

[George Rawlinson]

    Date: Tuesday, November 16, 2021 @ 07:18:51
  Author: grawlinson
Revision: 1048610

upgpkg: promscale_extension 0.3.0-1

* New upstream release.
* New build dependency: cargo-pgx.
* Automatically infer flag for pgx.

Modified:
  promscale_extension/trunk/PKGBUILD

----------+
 PKGBUILD |   25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-11-16 07:13:42 UTC (rev 1048609)
+++ PKGBUILD	2021-11-16 07:18:51 UTC (rev 1048610)
@@ -1,14 +1,14 @@
 # Maintainer: George Rawlinson <george at rawlinson.net.nz>
 
 pkgname=promscale_extension
-pkgver=0.2.0
-pkgrel=4
+pkgver=0.3.0
+pkgrel=1
 pkgdesc="PostgreSQL extension for Promscale"
 arch=('x86_64')
 url="https://github.com/timescale/promscale_extension"
 license=('custom:Timescale')
 depends=('gcc-libs' 'postgresql<14' 'timescaledb')
-makedepends=('rust' 'clang' 'llvm')
+makedepends=('rust' 'clang' 'llvm' 'cargo-pgx')
 optdepends=('promscale: for a local promscale instance')
 # last commit to license - used to pin license version
 _license_commit='490e9405874d284735e27e3f9f63a2f6dd31a08f'
@@ -16,26 +16,17 @@
   "$pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz"
   "LICENSE-TIMESCALE-$_license_commit::https://raw.githubusercontent.com/timescale/timescaledb/$_license_commit/tsl/LICENSE-TIMESCALE"
 )
-b2sums=('be01d7835ba13efd104fed3c9380d928580d05763d4e482bb404cba1086de21ce65d01be50af8223d313a153632095fbe0636055e9c3c72ae72c2fe6e94f61d9'
+sha512sums=('ccfccd7b059f0a571689f23a8c8ac252c7fcd59aef07a0a53493e0ca336c3b1e5d3a4fd33d6527dfb1b2bf3cb7e9aa3aaf43c8ce6d3c1dfa6736f76356539325'
+            'b7c5ce0ef87c1c5c2d4688910a915874be742732a023319e855a8fbb666b0da42683b714e1c3368975431796e4fcd0e524fae80a999bb8f15e4406d97b14a15e')
+b2sums=('c7036cc6a39f8bab6d51db98fe743e8231d5e5ff07e17dc27ad1e43e13c28563d26672f881f7821584914379e04e730a7db2e76616f168cca762f0a04d5385c9'
         '9ae11a930e930953b16f7d6d1d3fbf0ebb6c4d8687cac1475560603442ed8edd452200468f7fe9c82af651d40ccad192c036940bfe57ef093e7c30cce93383f0')
 
 build() {
   cd "$pkgname-$pkgver"
 
-  # upstream uses their own fork of the pgx library (ref: README.md)
-  # additionally, a different branch/commit is present in Cargo.lock
-  # so this is probably the cleanest method of building
-  local PGX_REPO='https://github.com/JLockerman/pgx.git'
-  local PGX_BRANCH='timescale'
-  local PGX_COMMIT='87e0460e6e88d6ffa9b9eb37dce4b71e4336e31e'
-  cargo install \
-    --git "$PGX_REPO" \
-    --branch "$PGX_BRANCH" \
-    --rev "$PGX_COMMIT" \
-    cargo-pgx
-
   # initialise pgx
-  cargo pgx init --pg13 pg_config
+  export _PGMAJOR=$(pg_config --version | sed -e 's/PostgreSQL //' -e 's/\..*//')
+  cargo pgx init "--pg${_PGMAJOR}" pg_config
 
   # build extension
   make