[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/08: gnu: hwloc: Remove input labels.
From: |
guix-commits |
Subject: |
03/08: gnu: hwloc: Remove input labels. |
Date: |
Mon, 11 Apr 2022 09:51:02 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit d81d8b1258af44636857795bab392135f5046e25
Author: Ludovic Courtès <ludovic.courtes@inria.fr>
AuthorDate: Mon Apr 11 15:05:32 2022 +0200
gnu: hwloc: Remove input labels.
* gnu/packages/mpi.scm (hwloc-1)[inputs]: Remove labels.
(hwloc-2)[inputs]: Use 'modify-inputs'.
---
gnu/packages/mpi.scm | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm
index 946c55c4a5..5ffe0e6da2 100644
--- a/gnu/packages/mpi.scm
+++ b/gnu/packages/mpi.scm
@@ -79,15 +79,12 @@
"doc" ;400+ section 3 man pages
"debug"))
(inputs
- `(("libx11" ,libx11)
- ("cairo" ,cairo)
- ("ncurses" ,ncurses)
- ("expat" ,expat)
- ,@(if (not (string-prefix? "armhf"
- (or (%current-target-system)
- (%current-system))))
- `(("numactl" ,numactl))
- '())))
+ (append (list libx11 cairo ncurses expat)
+ (if (not (string-prefix? "armhf"
+ (or (%current-target-system)
+ (%current-system))))
+ (list numactl)
+ '())))
(propagated-inputs
;; hwloc.pc lists it in 'Requires.private'.
(list libpciaccess))
@@ -163,7 +160,8 @@ bind processes, and much more.")
"13ajxwshxl1pa8b5gnkmm7hcg97m6xrlgz8vj1hmsb57qcv1skhd"))))
;; libnuma is no longer needed.
- (inputs (alist-delete "numactl" (package-inputs hwloc-1)))
+ (inputs (modify-inputs (package-inputs hwloc-1)
+ (delete "numactl")))
(arguments
(substitute-keyword-arguments (package-arguments hwloc-1)
((#:phases phases)
- branch master updated (3704a7b897 -> 88d0b086a9), guix-commits, 2022/04/11
- 01/08: http-client: Fix redirection., guix-commits, 2022/04/11
- 02/08: gnu: hwloc@1: Update to 1.11.13., guix-commits, 2022/04/11
- 07/08: gnu: openmpi: Update to 4.1.3., guix-commits, 2022/04/11
- 03/08: gnu: hwloc: Remove input labels.,
guix-commits <=
- 05/08: gnu: hwloc: Remove trailing #t., guix-commits, 2022/04/11
- 04/08: gnu: hwloc@1: Use 'target-arm32?' in conditional., guix-commits, 2022/04/11
- 08/08: gnu: openmpi: Remove trailing #t., guix-commits, 2022/04/11
- 06/08: gnu: openmpi: Remove input labels., guix-commits, 2022/04/11