summary refs log tree commit diff
path: root/gnu
diff options
context:
space:
mode:
authorLudovic Courtès <ludovic.courtes@inria.fr>2019-11-12 18:18:24 +0100
committerLudovic Courtès <ludo@gnu.org>2019-11-15 17:52:45 +0100
commit58a536bb1b1b441e56b47e79cde01ba73968398b (patch)
tree28d10406c8f03acf0f83d008ca81c7eba8c1561b /gnu
parent8c8e108978e0917415c863977b605b84dd01be52 (diff)
downloadguix-58a536bb1b1b441e56b47e79cde01ba73968398b.tar.gz
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.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/mpi.scm2
-rw-r--r--gnu/packages/parallel.scm2
2 files changed, 2 insertions, 2 deletions
diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm
index 6078186f40..79ee948765 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 0e47dfb2e4..4fc2c9afb4 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)