Robin Candau pushed to branch main at Arch Linux / Packaging / Packages / grafana-zabbix
Commits: 8b68f2c3 by Robin Candau at 2024-09-13T11:09:41+02:00 upgpkg: 4.5.4-1: New upstream release https://github.com/grafana/grafana-zabbix/releases/tag/v4.5.4 - - - - - 3 changed files: - .SRCINFO - PKGBUILD - − fix_tests_with_go_1.23.patch Changes: ===================================== .SRCINFO ===================================== @@ -1,6 +1,6 @@ pkgbase = grafana-zabbix pkgdesc = Zabbix plugin for Grafana dashboard - pkgver = 4.5.3 + pkgver = 4.5.4 pkgrel = 1 url = https://github.com/grafana/grafana-zabbix arch = x86_64 @@ -12,9 +12,7 @@ pkgbase = grafana-zabbix makedepends = nodejs-lts-iron makedepends = mage depends = grafana - source = grafana-zabbix-4.5.3.tar.gz::https://github.com/grafana/grafana-zabbix/archive/v4.5.3.tar.gz - source = fix_panic_with_go_1.23.patch::https://github.com/grafana/grafana-zabbix/commit/f20c89003393eff94780f5f20f6d591521886128.patch - sha256sums = 8e5e797693297afdba7e344076c6e2db4dcb1e32fd77ec2ac308f0223937fa9f - sha256sums = 26bd56abd3b3339ccc85f13c4f2da882afd462dc3cbaee59b4abeb6d41a5a827 + source = grafana-zabbix-4.5.4.tar.gz::https://github.com/grafana/grafana-zabbix/archive/v4.5.4.tar.gz + sha256sums = 7ae3ebbcf5392fc4c128ec8ca8ba56972b7c33b785b64c18e0637bfe82b009fd pkgname = grafana-zabbix ===================================== PKGBUILD ===================================== @@ -2,7 +2,7 @@ # Maintainer: Robin Candau <[email protected]> pkgname=grafana-zabbix -pkgver=4.5.3 +pkgver=4.5.4 pkgrel=1 pkgdesc="Zabbix plugin for Grafana dashboard" arch=('x86_64') @@ -10,10 +10,8 @@ url="https://github.com/grafana/grafana-zabbix"; license=('Apache-2.0') depends=('grafana') makedepends=('yarn' 'libfaketime' 'go' 'git' 'nodejs-lts-iron' 'mage') -source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/v${pkgver}.tar.gz" - fix_panic_with_go_1.23.patch::https://github.com/grafana/grafana-zabbix/commit/f20c89003393eff94780f5f20f6d591521886128.patch) -sha256sums=('8e5e797693297afdba7e344076c6e2db4dcb1e32fd77ec2ac308f0223937fa9f' - '26bd56abd3b3339ccc85f13c4f2da882afd462dc3cbaee59b4abeb6d41a5a827') +source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/v${pkgver}.tar.gz") +sha256sums=('7ae3ebbcf5392fc4c128ec8ca8ba56972b7c33b785b64c18e0637bfe82b009fd') prepare() { cd "${pkgname}-${pkgver}" @@ -21,10 +19,6 @@ prepare() { sed -i 's#jest --watch --onlyChanged#jest#' package.json # Remove lint related dependency (we don't care about linting tests at our level) sed -i '/GO111MODULE=off go get -u golang.org\/x\/lint\/golint/d' Makefile - # Temporary patch to fix panic in tests with go 1.23 - # See https://github.com/grafana/grafana-zabbix/pull/1875 - patch -Np1 < "${srcdir}/fix_panic_with_go_1.23.patch" - go mod tidy } build() { ===================================== fix_tests_with_go_1.23.patch deleted ===================================== @@ -1,28 +0,0 @@ -diff --git a/go.mod b/go.mod -index edf8ca0..f09b5a0 100644 ---- a/go.mod -+++ b/go.mod -@@ -38,7 +38,7 @@ require ( - github.com/google/uuid v1.6.0 // indirect - github.com/gorilla/mux v1.8.1 // indirect - github.com/grafana/otel-profiling-go v0.5.1 // indirect -- github.com/grafana/pyroscope-go/godeltaprof v0.1.7 // indirect -+ github.com/grafana/pyroscope-go/godeltaprof v0.1.8 // indirect - github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.0.1 // indirect - github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0 // indirect - github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1 // indirect -diff --git a/go.sum b/go.sum -index 9ad3253..7e6664e 100644 ---- a/go.sum -+++ b/go.sum -@@ -72,8 +72,8 @@ github.com/grafana/grafana-plugin-sdk-go v0.236.0 h1:SmBO0KuAwbKwp68sVrrMnpWhqkD - github.com/grafana/grafana-plugin-sdk-go v0.236.0/go.mod h1:diZikRjMwbyCDyKpieBK0MpSmHU4SNtvmW/iDfTXzyQ= - github.com/grafana/otel-profiling-go v0.5.1 h1:stVPKAFZSa7eGiqbYuG25VcqYksR6iWvF3YH66t4qL8= - github.com/grafana/otel-profiling-go v0.5.1/go.mod h1:ftN/t5A/4gQI19/8MoWurBEtC6gFw8Dns1sJZ9W4Tls= --github.com/grafana/pyroscope-go/godeltaprof v0.1.7 h1:C11j63y7gymiW8VugJ9ZW0pWfxTZugdSJyC48olk5KY= --github.com/grafana/pyroscope-go/godeltaprof v0.1.7/go.mod h1:Tk376Nbldo4Cha9RgiU7ik8WKFkNpfds98aUzS8omLE= -+github.com/grafana/pyroscope-go/godeltaprof v0.1.8 h1:iwOtYXeeVSAeYefJNaxDytgjKtUuKQbJqgAIjlnicKg= -+github.com/grafana/pyroscope-go/godeltaprof v0.1.8/go.mod h1:2+l7K7twW49Ct4wFluZD3tZ6e0SjanjcUUBPVD/UuGU= - github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.0.1 h1:qnpSQwGEnkcRpTqNOIR6bJbR0gAorgP9CSALpRcKoAA= - github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.0.1/go.mod h1:lXGCsh6c22WGtjr+qGHj1otzZpV/1kwTMAqkwZsnWRU= - github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0 h1:pRhl55Yx1eC7BZ1N+BBWwnKaMyD8uC+34TLdndZMAKk= View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/grafana-zabbix/-/commit/8b68f2c3c48b532ee1de056e3ba9702aa15de3f9 -- View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/grafana-zabbix/-/commit/8b68f2c3c48b532ee1de056e3ba9702aa15de3f9 You're receiving this email because of your account on gitlab.archlinux.org.
