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

Merge branch 'devel' into 'main'

Browse source 
Devel

See merge request glicid-public/guix-glicid!473
This commit is contained in:
Yann Dupont 2025-02-03 11:00:31 +00:00
commit a103791c30
2 changed files with 6 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
glicid/packages/monitoring.scm
View file

@ -17,7 +17,8 @@
(method url-fetch)
(uri (string-append "https://cdn.zabbix.com/zabbix/sources/stable/" (version-major+minor version) "/zabbix-" version ".tar.gz"))
(sha256 (base32 %zabbix-hash))
(patches (search-patches "glicid/packages/patches/glicid-zabbix-timescaledb-2.17.patch"))
;; YD upstream now able to cope with 2.17 timescaledb
;; (patches (search-patches "glicid/packages/patches/glicid-zabbix-timescaledb-2.17.patch"))
(modules '((guix build utils)))
(snippet
'(substitute* '("src/zabbix_proxy/proxy.c" "src/zabbix_server/server.c")
@ -33,7 +34,8 @@
(method url-fetch)
(uri (string-append "https://cdn.zabbix.com/zabbix/sources/stable/" (version-major+minor version) "/zabbix-" version ".tar.gz"))
(sha256 (base32 %zabbix-hash))
(patches (search-patches "glicid/packages/patches/glicid-zabbix-timescaledb-2.17.patch"))
;; YD upstream now able to cope with 2.17 timescaledb
;; (patches (search-patches "glicid/packages/patches/glicid-zabbix-timescaledb-2.17.patch"))
(modules '((guix build utils)))
(snippet
'(substitute* '("src/zabbix_proxy/proxy.c" "src/zabbix_server/server.c")
@ -49,7 +51,8 @@
(method url-fetch)
(uri (string-append "https://cdn.zabbix.com/zabbix/sources/stable/" (version-major+minor version) "/zabbix-" version ".tar.gz"))
(sha256 (base32 %zabbix-hash))
(patches (search-patches "glicid/packages/patches/glicid-zabbix-timescaledb-2.17.patch"))
;; YD upstream now able to cope with 2.17 timescaledb
;; (patches (search-patches "glicid/packages/patches/glicid-zabbix-timescaledb-2.17.patch"))
(modules '((guix build utils)))
(snippet
'(substitute* '("src/zabbix_proxy/proxy.c" "src/zabbix_server/server.c")

15
glicid/packages/patches/glicid-zabbix-timescaledb-2.17.patch
View file

@ -1,15 +0,0 @@
diff --git a/include/zbx_dbversion_constants.h b/include/zbx_dbversion_constants.h
index 9cfb80f..35145ae 100644
--- a/include/zbx_dbversion_constants.h
+++ b/include/zbx_dbversion_constants.h
@@ -64,8 +64,8 @@
#define ZBX_TIMESCALE_MIN_SUPPORTED_VERSION 20001
#define ZBX_TIMESCALE_MIN_SUPPORTED_VERSION_STR "2.0.1"
#define ZBX_TIMESCALE_MIN_VERSION_WITH_LICENSE_PARAM_SUPPORT 20000
-#define ZBX_TIMESCALE_MAX_VERSION 21699
-#define ZBX_TIMESCALE_MAX_VERSION_STR "2.16"
+#define ZBX_TIMESCALE_MAX_VERSION 21799
+#define ZBX_TIMESCALE_MAX_VERSION_STR "2.17"
#define ZBX_TIMESCALE_LICENSE_APACHE "apache"
#define ZBX_TIMESCALE_LICENSE_APACHE_STR "TimescaleDB Apache 2 Edition"
#define ZBX_TIMESCALE_LICENSE_COMMUNITY "timescale"