Merge branch 'zabbix' into 'main'

updating to 6.0.14

See merge request glicid-public/guix-glicid!234
This commit is contained in:
Jean-François GUILLAUME 2023-03-09 14:47:35 +00:00
commit 9a14895e56

View file

@ -8,12 +8,12 @@
(define-public zabbix-agentd
(package
(inherit gnu:zabbix-agentd)
(version "6.0.13")
(version "6.0.14")
(source
(origin
(method url-fetch)
(uri (string-append "https://cdn.zabbix.com/zabbix/sources/stable/" (version-major+minor version) "/zabbix-" version ".tar.gz"))
(sha256 (base32 "0d9aws19rvmsrhkvihnwmr4r1drhl20v9lppdw5wjacp7377xqdy"))
(sha256 (base32 "0n6fqa9vbhh2syxii7ds2x6dnplrgrj98by1zl0ij1wfbnbxa6k3"))
(patches (search-patches "glicid/packages/patches/glicid-zabbix-timescaledb-2.10.patch"))
(modules '((guix build utils)))
(snippet
@ -24,12 +24,12 @@
(define-public zabbix-agent2
(package
(inherit gnu:zabbix-agent2)
(version "6.0.13")
(version "6.0.14")
(source
(origin
(method url-fetch)
(uri (string-append "https://cdn.zabbix.com/zabbix/sources/stable/" (version-major+minor version) "/zabbix-" version ".tar.gz"))
(sha256 (base32 "0d9aws19rvmsrhkvihnwmr4r1drhl20v9lppdw5wjacp7377xqdy"))
(sha256 (base32 "0n6fqa9vbhh2syxii7ds2x6dnplrgrj98by1zl0ij1wfbnbxa6k3"))
(patches (search-patches "glicid/packages/patches/glicid-zabbix-timescaledb-2.10.patch"))
(modules '((guix build utils)))
(snippet
@ -40,15 +40,14 @@
(define-public zabbix-server
(package
(inherit gnu:zabbix-server)
(version "6.0.13")
(version "6.0.14")
(source
(origin
(method url-fetch)
(uri (string-append "https://cdn.zabbix.com/zabbix/sources/stable/" (version-major+minor version) "/zabbix-" version ".tar.gz"))
(sha256 (base32 "0d9aws19rvmsrhkvihnwmr4r1drhl20v9lppdw5wjacp7377xqdy"))
(sha256 (base32 "0n6fqa9vbhh2syxii7ds2x6dnplrgrj98by1zl0ij1wfbnbxa6k3"))
(patches (search-patches "glicid/packages/patches/glicid-zabbix-timescaledb-2.10.patch"))
(modules '((guix build utils)))
(snippet
'(substitute* '("src/zabbix_proxy/proxy.c" "src/zabbix_server/server.c")
(("/usr/sbin/fping6?") "/run/setuid-programs/fping")))))))