mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-02-10 05:31:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: hwloc: Remove input labels.

Browse source 
* gnu/packages/mpi.scm (hwloc-1)[inputs]: Remove labels.
(hwloc-2)[inputs]: Use 'modify-inputs'.
This commit is contained in:
Ludovic Courtès 2022-04-11 15:05:32 +02:00 • committed by Ludovic Courtès
parent 37fa61364e
commit d81d8b1258
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
gnu/packages/mpi.scm
View file

@ -79,15 +79,12 @@
"doc" ;400+ section 3 man pages "doc" ;400+ section 3 man pages
"debug")) "debug"))
(inputs (inputs
`(("libx11" ,libx11) (append (list libx11 cairo ncurses expat)
("cairo" ,cairo) (if (not (string-prefix? "armhf"
("ncurses" ,ncurses) (or (%current-target-system)
("expat" ,expat) (%current-system))))
,@(if (not (string-prefix? "armhf" (list numactl)
(or (%current-target-system) '())))
(%current-system))))
`(("numactl" ,numactl))
'())))
(propagated-inputs (propagated-inputs
;; hwloc.pc lists it in 'Requires.private'. ;; hwloc.pc lists it in 'Requires.private'.
(list libpciaccess)) (list libpciaccess))
@ -163,7 +160,8 @@ bind processes, and much more.")
"13ajxwshxl1pa8b5gnkmm7hcg97m6xrlgz8vj1hmsb57qcv1skhd")))) "13ajxwshxl1pa8b5gnkmm7hcg97m6xrlgz8vj1hmsb57qcv1skhd"))))
;; libnuma is no longer needed. ;; libnuma is no longer needed.
(inputs (alist-delete "numactl" (package-inputs hwloc-1))) (inputs (modify-inputs (package-inputs hwloc-1)
(delete "numactl")))
(arguments (arguments
(substitute-keyword-arguments (package-arguments hwloc-1) (substitute-keyword-arguments (package-arguments hwloc-1)
((#:phases phases) ((#:phases phases)