[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
08/14: gnu: dstat: Add bash-minimal to inputs and use gexps.
From: |
guix-commits |
Subject: |
08/14: gnu: dstat: Add bash-minimal to inputs and use gexps. |
Date: |
Thu, 19 Oct 2023 23:43:13 -0400 (EDT) |
apteryx pushed a commit to branch core-updates
in repository guix.
commit 954629de2491a0066f2e5673f5396474df83e834
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Thu Oct 19 23:21:11 2023 -0400
gnu: dstat: Add bash-minimal to inputs and use gexps.
* gnu/packages/admin.scm (dstat) [inputs]: Add bash-minimal.
[arguments]: Use gexps. Delete trailing #t.
Change-Id: Ia0635f39dfbc09be96690be678d1ad22983b6c08
---
gnu/packages/admin.scm | 38 +++++++++++++++++++-------------------
1 file changed, 19 insertions(+), 19 deletions(-)
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 63774044a2..8f9826d092 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -3469,26 +3469,26 @@ results (ndiff), and a packet generation and response
analysis tool (nping).")
"dstat-skip-devices-without-io.patch"))))
(build-system gnu-build-system)
(arguments
- `(#:tests? #f ; no make check
- #:make-flags
- (list (string-append "prefix=" (assoc-ref %outputs "out")))
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'fix-python3-DeprecationWarning
- (lambda _
- (substitute* "dstat"
- (("collections") "collections.abc"))
- #t))
- (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")
- `("GUIX_PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH"))))
- #t))))))
+ (list
+ #:tests? #f ; no make check
+ #:make-flags
+ #~(list (string-append "prefix=" #$output))
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'fix-python3-DeprecationWarning
+ (lambda _
+ (substitute* "dstat"
+ (("collections") "collections.abc"))))
+ (delete 'configure) ; no configure script
+ (add-after 'install 'wrap
+ (lambda _
+ (wrap-program (string-append #$output "/bin/dstat")
+ `("GUIX_PYTHONPATH" ":" prefix
+ (,(getenv "GUIX_PYTHONPATH")))))))))
(inputs
- `(("python" ,python-wrapper)
- ("python-six" ,python-six)))
+ (list bash-minimal ;for wrap-program
+ python-wrapper
+ 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
- branch core-updates updated (791499d97e -> 6d10ec739d), guix-commits, 2023/10/19
- 01/14: gnu: file: Update to 5.45, guix-commits, 2023/10/19
- 08/14: gnu: dstat: Add bash-minimal to inputs and use gexps.,
guix-commits <=
- 04/14: gnu: cloud-utils: Add bash-minimal to inputs., guix-commits, 2023/10/19
- 10/14: gnu: arandr: Add bash-minimal to inputs., guix-commits, 2023/10/19
- 02/14: gnu: libinput: Update to 1.24.0., guix-commits, 2023/10/19
- 06/14: gnu: rename: Add bash-minimal to inputs., guix-commits, 2023/10/19
- 13/14: gnu: wl-clipboard-x11: Remove trailing #t., guix-commits, 2023/10/19
- 05/14: gnu: clusterssh: Add bash-minimal to inputs., guix-commits, 2023/10/19
- 12/14: gnu: gammastep: Add bash-minimal to inputs., guix-commits, 2023/10/19
- 03/14: gnu: libinput: Remove input labels., guix-commits, 2023/10/19
- 07/14: gnu: nmap: Add bash-minimal to inputs., guix-commits, 2023/10/19
- 09/14: gnu: mkfontdir: Add bash-minimal to inputs., guix-commits, 2023/10/19