Robin Candau pushed to branch main at Arch Linux / Packaging / Packages / grafana-zabbix
Commits: 96021a36 by Robin Candau at 2024-09-03T19:43:30+02:00 upgpkg: 4.5.3-1: New upstream release + Update architecture + Update URL + Add temporary patch to fix panic in tests with go 1.23 https://github.com/grafana/grafana-zabbix/releases/tag/v4.5.3 https://github.com/grafana/grafana-zabbix/issues/1874 & https://github.com/grafana/grafana-zabbix/pull/1875 - - - - - 4 changed files: - .SRCINFO - .nvchecker.toml - PKGBUILD - + fix_tests_with_go_1.23.patch Changes: ===================================== .SRCINFO ===================================== @@ -1,9 +1,9 @@ pkgbase = grafana-zabbix pkgdesc = Zabbix plugin for Grafana dashboard - pkgver = 4.5.2 + pkgver = 4.5.3 pkgrel = 1 - url = https://github.com/alexanderzobnin/grafana-zabbix - arch = any + url = https://github.com/grafana/grafana-zabbix + arch = x86_64 license = Apache-2.0 makedepends = yarn makedepends = libfaketime @@ -12,7 +12,9 @@ pkgbase = grafana-zabbix makedepends = nodejs-lts-iron makedepends = mage depends = grafana - source = grafana-zabbix-4.5.2.tar.gz::https://github.com/alexanderzobnin/grafana-zabbix/archive/v4.5.2.tar.gz - sha256sums = 26d36c99ce5141d4adacff10126677bbf2f001df39a2070fa1932e1f513eb7cf + 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 pkgname = grafana-zabbix ===================================== .nvchecker.toml ===================================== @@ -1,4 +1,4 @@ [grafana-zabbix] source = "git" -git = "https://github.com/alexanderzobnin/grafana-zabbix.git"; +git = "https://github.com/grafana/grafana-zabbix.git"; prefix = "v" ===================================== PKGBUILD ===================================== @@ -2,16 +2,18 @@ # Maintainer: Robin Candau <[email protected]> pkgname=grafana-zabbix -pkgver=4.5.2 +pkgver=4.5.3 pkgrel=1 pkgdesc="Zabbix plugin for Grafana dashboard" -arch=('any') -url="https://github.com/alexanderzobnin/grafana-zabbix"; +arch=('x86_64') +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") -sha256sums=('26d36c99ce5141d4adacff10126677bbf2f001df39a2070fa1932e1f513eb7cf') +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') prepare() { cd "${pkgname}-${pkgver}" @@ -19,6 +21,10 @@ 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 ===================================== @@ -0,0 +1,28 @@ +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/96021a3619c98ed019e0506ab363d2ea35ad83ff -- View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/grafana-zabbix/-/commit/96021a3619c98ed019e0506ab363d2ea35ad83ff You're receiving this email because of your account on gitlab.archlinux.org.
