From 32bcadc98c146d373db20c4154cd0acfb12de6e1 Mon Sep 17 00:00:00 2001 From: "Paul A. Patience" Date: Mon, 25 Jul 2022 15:12:16 +0000 Subject: [PATCH] gnu: trilinos-for-dealii-openmpi: Remove input labels. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/maths.scm (trilinos-for-dealii-openmpi)[native-inputs, inputs, propagated-inputs]: Remove labels. Signed-off-by: Ludovic Courtès --- 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 @@ (define trilinos-for-dealii-openmpi (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