[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/06: gnu: inetutils: Remove input labels.
From: |
guix-commits |
Subject: |
04/06: gnu: inetutils: Remove input labels. |
Date: |
Sat, 27 Aug 2022 11:30:28 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit 73b829b4ccc36ffd8575d1e62fd612f98047d272
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Fri Aug 12 01:17:28 2022 +0200
gnu: inetutils: Remove input labels.
* gnu/packages/admin.scm (inetutils)[inputs, native-inputs]: Remove labels.
[arguments]: Use SEARCH-INPUT-FILE.
---
gnu/packages/admin.scm | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index db3e881228..84c7710d45 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -857,19 +857,21 @@ re-executing them as necessary.")
;; Make sure that canonical "coreutils" package is not referred.
#:make-flags
(list (string-append "CPPFLAGS=-DPATHDEF_CP=\\\""
- (assoc-ref %build-inputs "coreutils*")
- "/bin/cp\\\""))
+ (search-input-file %build-inputs "bin/cp")
+ "\\\""))
;; On some systems, 'libls.sh' may fail with an error such as:
;; "Failed to tell switch -a apart from -A".
#:parallel-tests? #f))
- (inputs `(("coreutils*" ,coreutils)
- ("shadow" ,shadow) ;for login (used in telnetd and rlogind)
- ("ncurses" ,ncurses)
- ("readline" ,readline))) ;for 'ftp'
- (native-inputs (if (member (%current-system)
- (package-supported-systems net-tools))
- `(("netstat" ,net-tools)) ;for tests
- '()))
+ (inputs
+ (list coreutils
+ shadow ;for login (used in telnetd and rlogind)
+ ncurses
+ readline)) ;for 'ftp'
+ (native-inputs
+ (if (member (%current-system)
+ (package-supported-systems net-tools))
+ (list net-tools) ;for tests
+ '()))
(home-page "https://www.gnu.org/software/inetutils/")
(synopsis "Basic networking utilities")
(description
- branch core-updates updated (0323bf7a19 -> e4291c39c1), guix-commits, 2022/08/27
- 01/06: gnu: nettle: Update to 3.8.1., guix-commits, 2022/08/27
- 03/06: gnu: gsl: Update to 2.7.1., guix-commits, 2022/08/27
- 04/06: gnu: inetutils: Remove input labels.,
guix-commits <=
- 02/06: gnu: libidn2: Update to 2.3.3., guix-commits, 2022/08/27
- 06/06: gnu: sqlite: Update to 3.39.2., guix-commits, 2022/08/27
- 05/06: gnu: inetutils: Update to 2.3., guix-commits, 2022/08/27