From 58a536bb1b1b441e56b47e79cde01ba73968398b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludovic.courtes@inria.fr>
Date: Tue, 12 Nov 2019 18:18:24 +0100
Subject: [PATCH] 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 6078186f40e..79ee9487651 100644
--- a/gnu/packages/mpi.scm
+++ b/gnu/packages/mpi.scm
@@ -177,7 +177,7 @@ (define-public openmpi
(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 0e47dfb2e48..4fc2c9afb41 100644
--- a/gnu/packages/parallel.scm
+++ b/gnu/packages/parallel.scm
@@ -139,7 +139,7 @@ (define-public slurm
;; 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)
--
GitLab