[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/17: gnu: petsc-openmpi: Remove input labels.
From: |
guix-commits |
Subject: |
02/17: gnu: petsc-openmpi: Remove input labels. |
Date: |
Fri, 18 Mar 2022 11:05:28 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 2da0f2828b5ef58b87eb0f4aed942748e6682f2f
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Fri Mar 18 12:46:58 2022 +0100
gnu: petsc-openmpi: Remove input labels.
* gnu/packages/maths.scm (petsc-openmpi)[inputs]: Use 'modify-inputs'.
[arguments]: Adjust label name for hdf5.
---
gnu/packages/maths.scm | 24 +++++++++++++-----------
1 file changed, 13 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 8e287a8055..ecb85642ec 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -3085,15 +3085,15 @@ scientific applications modeled by partial differential
equations.")
(inherit petsc)
(name "petsc-openmpi")
(inputs
- `(("hdf5" ,hdf5-parallel-openmpi)
- ("hypre" ,hypre-openmpi)
- ("metis" ,metis)
- ("mumps" ,mumps-openmpi)
- ("openmpi" ,openmpi)
- ("scalapack" ,scalapack)
- ("scotch" ,pt-scotch32)
- ("scotch" ,pt-scotch32 "metis")
- ,@(package-inputs petsc)))
+ (modify-inputs (package-inputs petsc)
+ (prepend hdf5-parallel-openmpi
+ hypre-openmpi
+ metis
+ mumps-openmpi
+ openmpi
+ scalapack
+ pt-scotch32
+ `(,pt-scotch32 "metis"))))
(arguments
(substitute-keyword-arguments (package-arguments petsc)
((#:configure-flags cf)
@@ -3106,9 +3106,11 @@ scientific applications modeled by partial differential
equations.")
,(string-append "--with-mpi-dir="
#$(this-package-input "openmpi"))
,(string-append "--with-hdf5-include="
- #$(this-package-input "hdf5") "/include")
+ #$(this-package-input "hdf5-parallel-openmpi")
+ "/include")
,(string-append "--with-hdf5-lib="
- #$(this-package-input "hdf5") "/lib/libhdf5.a")
+ #$(this-package-input "hdf5-parallel-openmpi")
+ "/lib/libhdf5.a")
,@(delete "--with-mpi=0" #$cf)))
((#:phases phases)
#~(modify-phases #$phases
- 11/17: gnu: emacs-osm: Record the absolute file name of 'curl'., (continued)
- 11/17: gnu: emacs-osm: Record the absolute file name of 'curl'., guix-commits, 2022/03/18
- 09/17: gnu: Add emacs-osm., guix-commits, 2022/03/18
- 04/17: ui: 'show-what-to-build' highlights "would be downloaded" headings., guix-commits, 2022/03/18
- 06/17: home: services: Export record type accessors., guix-commits, 2022/03/18
- 05/17: graph: Factorize 'lookup-backend'., guix-commits, 2022/03/18
- 10/17: gnu: emacs-osm: Fetch source over Git., guix-commits, 2022/03/18
- 08/17: guix system: Call 'export-graph' with the right port argument., guix-commits, 2022/03/18
- 07/17: guix home: Implement the 'extension-graph' and 'shepherd-graph' actions., guix-commits, 2022/03/18
- 12/17: home: services: Fix bash aliases without guix-defaults., guix-commits, 2022/03/18
- 14/17: gnu: feh, newsboat: Inline top-level reference to 'curl'., guix-commits, 2022/03/18
- 02/17: gnu: petsc-openmpi: Remove input labels.,
guix-commits <=
- 03/17: ui: 'show-what-to-build' highlights "The following [...] will be built"., guix-commits, 2022/03/18
- 15/17: gnu: Add ckb-next., guix-commits, 2022/03/18
- 17/17: gnu: bitlbee-purple: Use 'modify-inputs'., guix-commits, 2022/03/18
- 16/17: gnu: bitlbee-purple: Add search path for "PURPLE_PLUGIN_PATH"., guix-commits, 2022/03/18
- 13/17: gnu: ghc-optparse-applicative@0.15.1.0: Avoid circular top-level references., guix-commits, 2022/03/18