From 5cc5364ebad7f72afe0213b0a58997c195722a0a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 13 Jun 2019 02:17:48 +0200 Subject: gnu: dstat: Add python2-six. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/admin.scm (dstat)[inputs]: Add python2-six. [arguments]: Add ‘wrap’ phase to make dstat find required modules. --- gnu/packages/admin.scm | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index d85bd6e324..9392c59521 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2140,9 +2140,20 @@ results (ndiff), and a packet generation and response analysis tool (nping).") #:make-flags (let ((out (assoc-ref %outputs "out"))) (list (string-append "DESTDIR=" out) "prefix=/")) - ;; No configure script. - #:phases (modify-phases %standard-phases (delete 'configure)))) - (inputs `(("python-2" ,python-2))) + #:phases + (modify-phases %standard-phases + (delete 'configure) ; no configure script + (add-after 'install 'wrap + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (wrap-program (string-append out "/bin/dstat") + `("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH")))) + #t)))))) + (inputs + ;; Python 3 is supposedly supported but prints a DeprecationWarning. + ;; Upstream is dead. See . + `(("python" ,python-wrapper) + ("python-six" ,python-six))) (synopsis "Versatile resource statistics tool") (description "Dstat is a versatile replacement for @command{vmstat}, @command{iostat}, @command{netstat}, and @command{ifstat}. Dstat overcomes -- cgit v1.2.3