From 8c8e108978e0917415c863977b605b84dd01be52 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludovic.courtes@inria.fr>
Date: Tue, 12 Nov 2019 18:17:29 +0100
Subject: gnu: hwloc: Update to 2.1.0.

* gnu/packages/mpi.scm (hwloc-2.0): Rename to...
(hwloc-2): ... this.  Update to 2.1.0
(hwloc-2.0): Define as deprecated.
* gnu/packages/opencl.scm (pocl)[inputs]: Adjust accordingly.
---
 gnu/packages/mpi.scm    | 10 +++++++---
 gnu/packages/opencl.scm |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm
index a87194408f..6078186f40 100644
--- a/gnu/packages/mpi.scm
+++ b/gnu/packages/mpi.scm
@@ -31,6 +31,7 @@ (define-module (gnu packages mpi)
   #:use-module (guix download)
   #:use-module (guix git-download)
   #:use-module (guix utils)
+  #:use-module (guix deprecation)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system python)
   #:use-module (gnu packages)
@@ -130,11 +131,11 @@ (define-public hwloc
 bind processes, and much more.")
     (license bsd-3)))
 
-(define-public hwloc-2.0
+(define-public hwloc-2
   ;; Note: 2.0 isn't the default yet, see above.
   (package
     (inherit hwloc)
-    (version "2.0.3")
+    (version "2.1.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://www.open-mpi.org/software/hwloc/v"
@@ -142,7 +143,7 @@ (define-public hwloc-2.0
                                   "/downloads/hwloc-" version ".tar.bz2"))
               (sha256
                (base32
-                "09f7ajak8wv5issr0hw72vs3jkldc7crcc7z5fd34sspkvrsm4z3"))))
+                "0qh8s7pphz0m5cwb7liqmc17xzfs23xhz5wn24r6ikvjyx99fhhr"))))
 
     ;; libnuma is no longer needed.
     (inputs (alist-delete "numactl" (package-inputs hwloc)))
@@ -159,6 +160,9 @@ (define-public hwloc-2.0
                   "-1"))
                #t))))))))
 
+(define-deprecated hwloc-2.0 'hwloc-2
+  hwloc-2)
+
 (define-public openmpi
   (package
     (name "openmpi")
diff --git a/gnu/packages/opencl.scm b/gnu/packages/opencl.scm
index 81e5bab9db..50c99118c1 100644
--- a/gnu/packages/opencl.scm
+++ b/gnu/packages/opencl.scm
@@ -312,7 +312,7 @@ (define-public pocl
        ("pkg-config" ,pkg-config)))
     (inputs
      `(("clang" ,clang)
-       ("hwloc" ,hwloc-2.0 "lib")
+       ("hwloc" ,hwloc-2 "lib")
        ("llvm" ,llvm-8)
        ("ocl-icd" ,ocl-icd)))
     (arguments
-- 
cgit v1.2.3