10/12: gnu: openmpi, slurm: Switch to hwloc 2.x.

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit 58a536bb1b1b441e56b47e79cde01ba73968398b
Author: Ludovic Courtès <address@hidden>
Date:   Tue Nov 12 18:18:24 2019 +0100

    gnu: openmpi, slurm: Switch to hwloc 2.x.
    
    * gnu/packages/mpi.scm (openmpi)[inputs]: Switch to HWLOC-2.
    * gnu/packages/parallel.scm (slurm)[inputs]: Likewise.
---
 gnu/packages/mpi.scm      | 2 +-
 gnu/packages/parallel.scm | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm
index 6078186..79ee948 100644
--- a/gnu/packages/mpi.scm
+++ b/gnu/packages/mpi.scm
@@ -177,7 +177,7 @@ bind processes, and much more.")
        (base32 "0ms0zvyxyy3pnx9qwib6zaljyp2b3ixny64xvq3czv3jpr8zf2wh"))))
     (build-system gnu-build-system)
     (inputs
-     `(("hwloc" ,hwloc "lib")
+     `(("hwloc" ,hwloc-2 "lib")
        ("gfortran" ,gfortran)
        ("libfabric" ,libfabric)
        ("libevent" ,libevent)
diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm
index 0e47dfb..4fc2c9a 100644
--- a/gnu/packages/parallel.scm
+++ b/gnu/packages/parallel.scm
@@ -139,7 +139,7 @@ and they are executed on lists of files, hosts, users or 
other items.")
    ;; in particular mysql and gtk+.
    (inputs `(("expect" ,expect)
              ("freeipmi" ,freeipmi)
-             ("hwloc" ,hwloc "lib")
+             ("hwloc" ,hwloc-2 "lib")
              ("json-c" ,json-c)
              ("linux-pam" , linux-pam)
              ("munge" ,munge)