me
/
guix
Archived
1
0
Fork 0
Code

gnu: hwloc: Default to 2.x. 

* gnu/packages/mpi.scm (hwloc): Rename to...
(hwloc-1): ... this.
(hwloc-2): Adjust 'inherit' clause accordingly.
(hwloc): New variable.
master
Ludovic Courtès 2019-11-19 10:28:22 +01:00
parent 69f759912d
commit 8ec7ca22d3
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gnu/packages/mpi.scm
View File

@ -52,7 +52,7 @@
#:use-module (srfi srfi-1) #:use-module (srfi srfi-1)
#:use-module (ice-9 match)) #:use-module (ice-9 match))
(define-public hwloc (define-public hwloc-1
;; Note: For now we keep 1.x as the default because many packages have yet ;; Note: For now we keep 1.x as the default because many packages have yet
;; to migrate to 2.0. ;; to migrate to 2.0.
(package (package
@ -134,7 +134,7 @@ bind processes, and much more.")
(define-public hwloc-2 (define-public hwloc-2
;; Note: 2.0 isn't the default yet, see above. ;; Note: 2.0 isn't the default yet, see above.
(package (package
(inherit hwloc) (inherit hwloc-1)
(version "2.1.0") (version "2.1.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
@ -163,6 +163,10 @@ bind processes, and much more.")
(define-deprecated hwloc-2.0 'hwloc-2 (define-deprecated hwloc-2.0 'hwloc-2
hwloc-2) hwloc-2)
(define-public hwloc
;; The latest stable series of hwloc.
hwloc-2)
(define-public openmpi (define-public openmpi
(package (package
(name "openmpi") (name "openmpi")