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