[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/06: gnu: trilinos-for-dealii-openmpi: Remove input labels.
From: |
guix-commits |
Subject: |
04/06: gnu: trilinos-for-dealii-openmpi: Remove input labels. |
Date: |
Mon, 1 Aug 2022 11:21:20 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 32bcadc98c146d373db20c4154cd0acfb12de6e1
Author: Paul A. Patience <paul@apatience.com>
AuthorDate: Mon Jul 25 15:12:16 2022 +0000
gnu: trilinos-for-dealii-openmpi: Remove input labels.
* gnu/packages/maths.scm (trilinos-for-dealii-openmpi)[native-inputs,
inputs, propagated-inputs]: Remove labels.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
gnu/packages/maths.scm | 53 +++++++++++++++++++++++++-------------------------
1 file changed, 27 insertions(+), 26 deletions(-)
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 99b5e36ff6..e3cc3c993e 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -5152,34 +5152,35 @@ revised simplex and the branch-and-bound methods.")
(base32 "0fnwlhzsh85qj38cq3igbs8nm1b2jdgr2z734sapmyyzsy21mkgp"))))
(build-system cmake-build-system)
(native-inputs
- `(;; The build fails with the current gcc.
- ;; Use the version from when Trilinos was added.
- ("gcc" ,gcc-7)
- ("gfortran" ,gfortran)
- ;; Trilinos's repository contains several C-shell scripts, but adding
- ;; tcsh to the native inputs does not result in the check phase running
- ;; any more tests than without it (nor is tcsh required to build
- ;; Trilinos).
- ;; It seems that Trilinos has replaced its use of C-shell test scripts
- ;; with CMake's testing facilities.
- ;; For example,
- ;; packages/zoltan/doc/Zoltan_html/dev_html/dev_test_script.html [1]
- ;; states that Zoltan's C-shell test script
- ;; packages/zoltan/test/test_zoltan has been obsoleted by the tests now
- ;; performed through CMake.
- ;;
- ;; Perl is required for some Zoltan tests and Python 2 for one ML test.
- ;;
- ;; [1]: https://cs.sandia.gov/zoltan/dev_html/dev_test_script.html
- ("perl" ,perl)
- ("python" ,python-2)))
+ (list
+ ;; The build fails with the current gcc.
+ ;; Use the version from when Trilinos was added.
+ gcc-7
+ gfortran
+ ;; Trilinos's repository contains several C-shell scripts, but adding
+ ;; tcsh to the native inputs does not result in the check phase running
+ ;; any more tests than without it (nor is tcsh required to build
+ ;; Trilinos).
+ ;; It seems that Trilinos has replaced its use of C-shell test scripts
+ ;; with CMake's testing facilities.
+ ;; For example,
+ ;; packages/zoltan/doc/Zoltan_html/dev_html/dev_test_script.html [1]
+ ;; states that Zoltan's C-shell test script
+ ;; packages/zoltan/test/test_zoltan has been obsoleted by the tests now
+ ;; performed through CMake.
+ ;;
+ ;; Perl is required for some Zoltan tests and Python 2 for one ML test.
+ ;;
+ ;; [1]: https://cs.sandia.gov/zoltan/dev_html/dev_test_script.html
+ perl
+ python-2))
(inputs
- `(("blas" ,openblas)
- ("lapack" ,lapack)
- ("mumps" ,mumps-openmpi)
- ("scalapack" ,scalapack)))
+ (list openblas
+ lapack
+ mumps-openmpi
+ scalapack))
(propagated-inputs
- `(("mpi" ,openmpi)))
+ (list openmpi))
(arguments
`(#:build-type "Release"
#:configure-flags
- branch master updated (c6800aa31e -> d7e7494bc4), guix-commits, 2022/08/01
- 06/06: gnu: Add fail2ban., guix-commits, 2022/08/01
- 03/06: gnu: dealii: Update to 9.4.0., guix-commits, 2022/08/01
- 01/06: gnu: trilinos-for-dealii-openmpi: Fix build., guix-commits, 2022/08/01
- 02/06: gnu: dealii: Use G-expressions., guix-commits, 2022/08/01
- 04/06: gnu: trilinos-for-dealii-openmpi: Remove input labels.,
guix-commits <=
- 05/06: gnu: trilinos-for-dealii-openmpi: Use G-expressions., guix-commits, 2022/08/01