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

Florian Pritz bluewind at archlinux.org
Sat Jan 23 15:46:55 UTC 2021


    Date: Saturday, January 23, 2021 @ 15:46:55
  Author: bluewind
Revision: 826758

upgpkg: grafana-zabbix 4.1.1-2: fix FS#69188 - [grafana-zabbix] Plugin not working for latest version 4.1.1

Modified:
  grafana-zabbix/trunk/PKGBUILD

----------+
 PKGBUILD |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-01-23 15:41:21 UTC (rev 826757)
+++ PKGBUILD	2021-01-23 15:46:55 UTC (rev 826758)
@@ -1,32 +1,32 @@
 # Maintainer: Florian Pritz <bluewind at xinu.at>
 pkgname=grafana-zabbix
 pkgver=4.1.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Zabbix plugin for Grafana dashboard"
 arch=('any')
 url="https://github.com/alexanderzobnin/grafana-zabbix"
 license=('APACHE')
 depends=('grafana')
-makedepends=(yarn python2 libfaketime) # node-sass depends on node-gyp 3.8.0 which is still python2 https://github.com/sass/node-sass/issues/2877
+makedepends=(yarn python2 libfaketime go git) # node-sass depends on node-gyp 3.8.0 which is still python2 https://github.com/sass/node-sass/issues/2877
 source=("$pkgname-$pkgver.tar.gz::https://github.com/alexanderzobnin/grafana-zabbix/archive/v$pkgver.tar.gz")
 sha256sums=('d44882a4f7b13e9fe4e6934e2fc448be1e8527562fc00af70e0aa673189e0f88')
 
 build() {
 	cd "$pkgname-$pkgver"
-	yarn install --pure-lockfile
-	yarn upgrade node-sass
-	yarn build
+	make install
+	make build
+	make dist
 }
 
 check() {
 	cd "$pkgname-$pkgver"
 	# Force UTC timezone so that tests pass, even after a DST change
-	TZ=UTC yarn test
+	PATH="$PATH:/build/go/bin" TZ=UTC make test lint
 }
 
 package() {
 	cd "$pkgname-$pkgver"
 	install -dm755 "$pkgdir/var/lib/grafana/plugins/alexanderzobnin-zabbix-app"
-	cp -r . "$pkgdir/var/lib/grafana/plugins/alexanderzobnin-zabbix-app"
+	cp -r dist/* "$pkgdir/var/lib/grafana/plugins/alexanderzobnin-zabbix-app"
 	rm -rf "$pkgdir/var/lib/grafana/plugins/alexanderzobnin-zabbix-app/node_modules"
 }



More information about the arch-commits mailing list