From patchwork Mon Jul 25 15:12:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Paul A. Patience" X-Patchwork-Id: 40955 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 4D3E727BBEA; Mon, 25 Jul 2022 16:14:45 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E776727BBE9 for ; Mon, 25 Jul 2022 16:14:44 +0100 (BST) Received: from localhost ([::1]:40136 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oFzn9-0004Mv-To for patchwork@mira.cbaines.net; Mon, 25 Jul 2022 11:14:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36754) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oFzlY-0002C4-Kv for guix-patches@gnu.org; Mon, 25 Jul 2022 11:13:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33357) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oFzlY-0002tF-3l for guix-patches@gnu.org; Mon, 25 Jul 2022 11:13:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oFzlX-0001nm-Vg for guix-patches@gnu.org; Mon, 25 Jul 2022 11:13:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56760] [PATCH v2 4/6] gnu: trilinos-for-dealii-openmpi: Remove input labels. Resent-From: "Paul A. Patience" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 25 Jul 2022 15:13:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56760 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56760@debbugs.gnu.org Cc: "Paul A. Patience" Received: via spool by 56760-submit@debbugs.gnu.org id=B56760.16587619536831 (code B ref 56760); Mon, 25 Jul 2022 15:13:03 +0000 Received: (at 56760) by debbugs.gnu.org; 25 Jul 2022 15:12:33 +0000 Received: from localhost ([127.0.0.1]:51327 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oFzl3-0001m7-BN for submit@debbugs.gnu.org; Mon, 25 Jul 2022 11:12:33 -0400 Received: from mail-4018.proton.ch ([185.70.40.18]:24868) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oFzl1-0001lf-Oo for 56760@debbugs.gnu.org; Mon, 25 Jul 2022 11:12:32 -0400 Date: Mon, 25 Jul 2022 15:12:16 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apatience.com; s=protonmail2; t=1658761945; x=1659021145; bh=I8vkwaExuUiJnCkCXYbbPTZoJf1G83MzyS4ePFDgWe8=; h=Date:To:From:Cc:Reply-To:Subject:Message-ID:In-Reply-To: References:Feedback-ID:From:To:Cc:Date:Subject:Reply-To: Feedback-ID:Message-ID; b=VZaDhDO5PKmbGnxL0vfCH0XWxYyWAQSx4PWno2uUGvrTYE1szy542HUkNCpLBeLnt jwU1yeHZE/8ArKHALCksrW+xOmT7LL/xRM9A7eI/YGOXEzIurs8s+dcKE+d1abRxjq FE1Mz/hxS+kjXOw7lc0wi93HqHfLJgzZQbx7hTHAQPIAeebwx16FFjJh31o+Nqpngq Y68/K7ShTc9lrWivABruZBDf0Uvum0L/j+xs7veBwkR24ldUgvHg1IIB29Xtt0cF9W wR596k0hriu4MIynkoDTcYOn6ZA90cVNQMmYdd+XewwemCDlUdVApKljbXCQwOaTSi WhOtSR76PeGDA== From: "Paul A. Patience" Message-ID: <20220725151135.3924177-5-paul@apatience.com> In-Reply-To: <20220725151135.3924177-1-paul@apatience.com> References: <20220725151135.3924177-1-paul@apatience.com> Feedback-ID: 19227857:user:proton MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: "Paul A. Patience" Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/maths.scm (trilinos-for-dealii-openmpi)[native-inputs, inputs, propagated-inputs]: Remove labels. --- gnu/packages/maths.scm | 53 +++++++++++++++++++++--------------------- 1 file changed, 27 insertions(+), 26 deletions(-) -- 2.37.1 diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index a2123d2dc8..27b92d369c 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -5153,34 +5153,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