GLiCID/guix-glicid
7
0
Fork 0
mirror of https://gitlab.univ-nantes.fr/glicid-public/guix-glicid.git synced 2025-04-30 06:08:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

bumping timescaledb supported version to 2.10

Browse source
This commit is contained in:
Jean-François GUILLAUME 2023-03-03 07:25:33 +00:00
commit d2fcf8566a
2 changed files with 71 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
glicid/packages/monitoring.scm
View file

@ -1,9 +1,8 @@
(define-module (glicid packages monitoring) (define-module (glicid packages monitoring)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (gnu packages)
#:use-module ((gnu packages monitoring) #:use-module ((gnu packages monitoring) #:prefix gnu:)
#:prefix gnu:)
#:use-module (guix download)) #:use-module (guix download))
(define-public zabbix-agentd (define-public zabbix-agentd
@ -11,23 +10,15 @@
(inherit gnu:zabbix-agentd) (inherit gnu:zabbix-agentd)
(version "6.0.13") (version "6.0.13")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append "https://cdn.zabbix.com/zabbix/sources/stable/" (version-major+minor version) "/zabbix-" version ".tar.gz"))
"https://cdn.zabbix.com/zabbix/sources/stable/" (sha256 (base32 "0d9aws19rvmsrhkvihnwmr4r1drhl20v9lppdw5wjacp7377xqdy"))
(version-major+minor version) "/zabbix-" version ".tar.gz")) (patches (search-patches "glicid/packages/patches/glicid-zabbix-timescaledb-2.10.patch"))
(sha256
(base32 "0d9aws19rvmsrhkvihnwmr4r1drhl20v9lppdw5wjacp7377xqdy"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(substitute* '("src/zabbix_proxy/proxy.c" '(substitute* '("src/zabbix_proxy/proxy.c" "src/zabbix_server/server.c")
"src/zabbix_server/server.c") (("/usr/sbin/fping6?") "/run/setuid-programs/fping")))))))
;; 'fping' must be setuid, so look for it in the usual location.
(("/usr/sbin/fping6?")
"/run/setuid-programs/fping")))))
))
(define-public zabbix-agent2 (define-public zabbix-agent2
@ -35,23 +26,15 @@
(inherit gnu:zabbix-agent2) (inherit gnu:zabbix-agent2)
(version "6.0.13") (version "6.0.13")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append "https://cdn.zabbix.com/zabbix/sources/stable/" (version-major+minor version) "/zabbix-" version ".tar.gz"))
"https://cdn.zabbix.com/zabbix/sources/stable/" (sha256 (base32 "0d9aws19rvmsrhkvihnwmr4r1drhl20v9lppdw5wjacp7377xqdy"))
(version-major+minor version) "/zabbix-" version ".tar.gz")) (patches (search-patches "glicid/packages/patches/glicid-zabbix-timescaledb-2.10.patch"))
(sha256
(base32 "0d9aws19rvmsrhkvihnwmr4r1drhl20v9lppdw5wjacp7377xqdy"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(substitute* '("src/zabbix_proxy/proxy.c" '(substitute* '("src/zabbix_proxy/proxy.c" "src/zabbix_server/server.c")
"src/zabbix_server/server.c") (("/usr/sbin/fping6?") "/run/setuid-programs/fping")))))))
;; 'fping' must be setuid, so look for it in the usual location.
(("/usr/sbin/fping6?")
"/run/setuid-programs/fping")))))
))
(define-public zabbix-server (define-public zabbix-server
@ -59,24 +42,13 @@
(inherit gnu:zabbix-server) (inherit gnu:zabbix-server)
(version "6.0.13") (version "6.0.13")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append "https://cdn.zabbix.com/zabbix/sources/stable/" (version-major+minor version) "/zabbix-" version ".tar.gz"))
"https://cdn.zabbix.com/zabbix/sources/stable/" (sha256 (base32 "0d9aws19rvmsrhkvihnwmr4r1drhl20v9lppdw5wjacp7377xqdy"))
(version-major+minor version) "/zabbix-" version ".tar.gz")) (patches (search-patches "glicid/packages/patches/glicid-zabbix-timescaledb-2.10.patch"))
(sha256
(base32 "0d9aws19rvmsrhkvihnwmr4r1drhl20v9lppdw5wjacp7377xqdy"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(substitute* '("src/zabbix_proxy/proxy.c" '(substitute* '("src/zabbix_proxy/proxy.c" "src/zabbix_server/server.c")
"src/zabbix_server/server.c") (("/usr/sbin/fping6?") "/run/setuid-programs/fping")))))))
;; 'fping' must be setuid, so look for it in the usual location.
(("/usr/sbin/fping6?")
"/run/setuid-programs/fping")))))
)
)

27
glicid/packages/patches/glicid-zabbix-timescaledb-2.10.patch Normal file
View file

@ -0,0 +1,27 @@
From 2ba64970de034357f22dd5f0fca0e588f4060fcd Mon Sep 17 00:00:00 2001
From: JEAN-FRANCOIS GUILLAUME <mrbear@yam-it.net>
Date: Fri, 3 Mar 2023 08:20:47 +0100
Subject: [PATCH] bumping timescaledb supported version to 2.10
---
include/zbxdb.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/zbxdb.h b/include/zbxdb.h
index 111d89a..4716f75 100644
--- a/include/zbxdb.h
+++ b/include/zbxdb.h
@@ -197,8 +197,8 @@ int zbx_db_strlen_n(const char *text_loc, size_t maxlen);
#define ZBX_TIMESCALE_MIN_SUPPORTED_VERSION 20001
#define ZBX_TIMESCALE_MIN_SUPPORTED_VERSION_FRIENDLY "2.0.1"
#define ZBX_TIMESCALE_MIN_VERSION_WITH_LICENSE_PARAM_SUPPORT 20000
-#define ZBX_TIMESCALE_MAX_VERSION 20999
-#define ZBX_TIMESCALE_MAX_VERSION_FRIENDLY "2.9"
+#define ZBX_TIMESCALE_MAX_VERSION 21000
+#define ZBX_TIMESCALE_MAX_VERSION_FRIENDLY "2.10"
#define ZBX_TIMESCALE_LICENSE_APACHE "apache"
#define ZBX_TIMESCALE_LICENSE_APACHE_FRIENDLY "TimescaleDB Apache 2 Edition"
#define ZBX_TIMESCALE_LICENSE_COMMUNITY "timescale"
--
2.39.2