From d485faf633a636e4db11c83fb1215240b4fd0e87 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Jun 2022 17:05:16 +0200 Subject: gnu: zabbix-cli: Use new style. * gnu/packages/monitoring.scm (zabbix-cli)[arguments]: Use SEARCH-INPUT-FILE. [inputs]: Remove labels. --- gnu/packages/monitoring.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu/packages/monitoring.scm') diff --git a/gnu/packages/monitoring.scm b/gnu/packages/monitoring.scm index 2e04c32f0a..d925953eab 100644 --- a/gnu/packages/monitoring.scm +++ b/gnu/packages/monitoring.scm @@ -266,18 +266,18 @@ (define-public zabbix-cli (arguments '(#:phases (modify-phases %standard-phases (add-after 'unpack 'use-absolute-ncurses - (lambda _ - (substitute* "bin/zabbix-cli" - (("'clear'") - (string-append "'" (which "clear") "'"))))) + (lambda* (#:key inputs #:allow-other-keys) + (let ((clear (search-input-file inputs "bin/clear"))) + (substitute* "bin/zabbix-cli" + (("'clear'") + (string-append "'" clear "'")))))) (add-after 'unpack 'patch-setup.py (lambda _ ;; Install data_files to $out/share instead of /usr/share. (substitute* "setup.py" (("/usr/") ""))))))) (inputs - `(("clear" ,ncurses) - ("python-requests" ,python-requests))) + (list ncurses python-requests)) (home-page "https://github.com/unioslo/zabbix-cli") (synopsis "Command-line interface to Zabbix") (description -- cgit v1.2.3 From 961c9c07e1074c7084ea3fca2aa589c7c6e9eea5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Jun 2022 22:49:18 +0200 Subject: gnu: zabbix-cli: Update to 2.3.0. * gnu/packages/monitoring.scm (zabbix-cli): Update to 2.3.0. [arguments]: Convert to gexp. Install documentation and run tests. [native-inputs]: Add PYTHON-SPHINX and PYTHON-PYTEST. --- gnu/packages/monitoring.scm | 46 +++++++++++++++++++++++++++++++-------------- 1 file changed, 32 insertions(+), 14 deletions(-) (limited to 'gnu/packages/monitoring.scm') diff --git a/gnu/packages/monitoring.scm b/gnu/packages/monitoring.scm index d925953eab..6da4ed36c7 100644 --- a/gnu/packages/monitoring.scm +++ b/gnu/packages/monitoring.scm @@ -61,6 +61,7 @@ (define-module (gnu packages monitoring) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages rrdtool) + #:use-module (gnu packages sphinx) #:use-module (gnu packages time) #:use-module (gnu packages tls) #:use-module (gnu packages web)) @@ -252,7 +253,7 @@ (define-public zabbix-server (define-public zabbix-cli (package (name "zabbix-cli") - (version "2.2.1") + (version "2.3.0") (source (origin (method git-fetch) (uri (git-reference @@ -261,21 +262,38 @@ (define-public zabbix-cli (file-name (git-file-name name version)) (sha256 (base32 - "0wzmrn8p09ksqhhgawr179c4az7p2liqr0l4q2dra62bxliawyqz")))) + "1p8xkq3mxg476srwrgqax76vjzji0rjx32njmgnpa409vaqrbj5p")))) (build-system python-build-system) (arguments - '(#:phases (modify-phases %standard-phases - (add-after 'unpack 'use-absolute-ncurses - (lambda* (#:key inputs #:allow-other-keys) - (let ((clear (search-input-file inputs "bin/clear"))) - (substitute* "bin/zabbix-cli" - (("'clear'") - (string-append "'" clear "'")))))) - (add-after 'unpack 'patch-setup.py - (lambda _ - ;; Install data_files to $out/share instead of /usr/share. - (substitute* "setup.py" - (("/usr/") ""))))))) + (list #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'use-absolute-ncurses + (lambda* (#:key inputs #:allow-other-keys) + (let ((clear (search-input-file inputs "bin/clear"))) + (substitute* "bin/zabbix-cli" + (("'clear'") + (string-append "'" clear "'")))))) + (add-after 'unpack 'patch-setup.py + (lambda _ + ;; Install data_files to $out/share instead of /usr/share. + (substitute* "setup.py" + (("/usr/") "")))) + (add-after 'build 'build-docs + (lambda _ + (invoke "make" "-C" "docs" "manual") + (invoke "make" "-C" "docs" "singlehtml"))) + (add-after 'install 'install-docs + (lambda _ + (install-file "docs/_build/man/zabbix-cli.1" + (string-append #$output "/share/man/man1")) + (copy-recursively "docs/_build/singlehtml" + (string-append #$output "/share/doc/" + #$name "/html")))) + (replace 'check + (lambda _ + (invoke "pytest" "-vv")))))) + (native-inputs + (list python-pytest python-sphinx)) (inputs (list ncurses python-requests)) (home-page "https://github.com/unioslo/zabbix-cli") -- cgit v1.2.3 From de52ffc6b44d5fb63961c9a39b6a4eeca2200f10 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 23 Jun 2022 13:08:56 +0200 Subject: gnu: Zabbix: Update to 6.0.5. * gnu/packages/monitoring.scm (zabbix-agentd): Update to 6.0.5. --- gnu/packages/monitoring.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/monitoring.scm') diff --git a/gnu/packages/monitoring.scm b/gnu/packages/monitoring.scm index 6da4ed36c7..1544efb614 100644 --- a/gnu/packages/monitoring.scm +++ b/gnu/packages/monitoring.scm @@ -165,7 +165,7 @@ (define-public nagios (define-public zabbix-agentd (package (name "zabbix-agentd") - (version "6.0.3") + (version "6.0.5") (source (origin (method url-fetch) @@ -173,7 +173,7 @@ (define-public zabbix-agentd "https://cdn.zabbix.com/zabbix/sources/stable/" (version-major+minor version) "/zabbix-" version ".tar.gz")) (sha256 - (base32 "0hihi94dk235cn4rwhrzm496dlihk0pv8785y2jyqi17jhl566g6")) + (base32 "1hmx6dgsag84dpv867p12bkln141nypgkp6zhipxbnn5xxip1sry")) (modules '((guix build utils))) (snippet '(substitute* '("src/zabbix_proxy/proxy.c" -- cgit v1.2.3