[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/08: gnu: hdf5: Use 'package/inherit' for variants.
From: |
guix-commits |
Subject: |
04/08: gnu: hdf5: Use 'package/inherit' for variants. |
Date: |
Tue, 25 Aug 2020 18:52:54 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 4788e5542025ba82e03e02d49a04416292d1fccb
Author: Ludovic Courtès <ludovic.courtes@inria.fr>
AuthorDate: Tue Aug 25 15:18:56 2020 +0200
gnu: hdf5: Use 'package/inherit' for variants.
* gnu/packages/maths.scm (hdf5-1.10, hdf5-parallel-openmpi): Use
'package/inherit'.
---
gnu/packages/maths.scm | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 64b6841..8e0d307 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -1181,23 +1181,23 @@ extremely large and complex data collections.")
"https://www.hdfgroup.org/ftp/HDF5/current/src/unpacked/COPYING"))))
(define-public hdf5-1.10
- (package (inherit hdf5-1.8)
+ (package/inherit hdf5-1.8
(version "1.10.6")
(source
(origin
- (method url-fetch)
- (uri (list (string-append
"https://support.hdfgroup.org/ftp/HDF5/releases/"
- "hdf5-" (version-major+minor version)
- "/hdf5-" version "/src/hdf5-"
- version ".tar.bz2")
- (string-append "https://support.hdfgroup.org/ftp/HDF5/"
- "current"
- (apply string-append
- (take (string-split version #\.) 2))
- "/src/hdf5-" version ".tar.bz2")))
- (sha256
- (base32 "1gf38x51128hn00744358w27xgzjk0ff4wra4yxh2lk804ck1mh9"))
- (patches (search-patches "hdf5-config-date.patch"))))))
+ (method url-fetch)
+ (uri (list (string-append
"https://support.hdfgroup.org/ftp/HDF5/releases/"
+ "hdf5-" (version-major+minor version)
+ "/hdf5-" version "/src/hdf5-"
+ version ".tar.bz2")
+ (string-append "https://support.hdfgroup.org/ftp/HDF5/"
+ "current"
+ (apply string-append
+ (take (string-split version #\.) 2))
+ "/src/hdf5-" version ".tar.bz2")))
+ (sha256
+ (base32 "1gf38x51128hn00744358w27xgzjk0ff4wra4yxh2lk804ck1mh9"))
+ (patches (search-patches "hdf5-config-date.patch"))))))
(define-public hdf5
;; Default version of HDF5.
@@ -1411,7 +1411,7 @@ Swath).")
(license (license:non-copyleft home-page))))
(define-public hdf5-parallel-openmpi
- (package (inherit hdf5)
+ (package/inherit hdf5
(name "hdf5-parallel-openmpi")
(inputs
`(("mpi" ,openmpi)
- branch master updated (e45d7f3 -> 253fcfe), guix-commits, 2020/08/25
- 02/08: gnu: hdf5: Distinguish the default hdf5 version., guix-commits, 2020/08/25
- 01/08: lint: Use 'with-error-handling'., guix-commits, 2020/08/25
- 04/08: gnu: hdf5: Use 'package/inherit' for variants.,
guix-commits <=
- 06/08: gnu: hdf5-parallel-openmpi: Update to 1.10.6., guix-commits, 2020/08/25
- 07/08: gnu: netcdf-parallel-openmpi: Allow MPI tests to pass., guix-commits, 2020/08/25
- 05/08: services: mcron: Validate jobs at build time., guix-commits, 2020/08/25
- 03/08: .dir-locals.el: Add indentation rule for 'package/inherit'., guix-commits, 2020/08/25
- 08/08: gnu: octave: Remove unneeded 'source' field., guix-commits, 2020/08/25