From patchwork Fri Apr 14 19:27:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Gruber X-Patchwork-Id: 49169 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 174E21759B; Fri, 14 Apr 2023 20:45:25 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham 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 62A1217620 for ; Fri, 14 Apr 2023 20:29:59 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pnP6X-00035Y-Bi; Fri, 14 Apr 2023 15:29:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pnP6V-000332-NS for guix-patches@gnu.org; Fri, 14 Apr 2023 15:29:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pnP6V-0001me-E8 for guix-patches@gnu.org; Fri, 14 Apr 2023 15:29:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pnP6V-000843-A4 for guix-patches@gnu.org; Fri, 14 Apr 2023 15:29:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62842] [PATCH 07/11] gnu: dune-alugrid: Update to 2.9.0. Resent-From: Felix Gruber Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 14 Apr 2023 19:29:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62842 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62842@debbugs.gnu.org Cc: Felix Gruber Received: via spool by 62842-submit@debbugs.gnu.org id=B62842.168150048730856 (code B ref 62842); Fri, 14 Apr 2023 19:29:03 +0000 Received: (at 62842) by debbugs.gnu.org; 14 Apr 2023 19:28:07 +0000 Received: from localhost ([127.0.0.1]:47714 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pnP5a-00081W-8o for submit@debbugs.gnu.org; Fri, 14 Apr 2023 15:28:06 -0400 Received: from mout02.posteo.de ([185.67.36.66]:54891) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pnP5W-0007zP-9N for 62842@debbugs.gnu.org; Fri, 14 Apr 2023 15:28:03 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id BF4A42403B8 for <62842@debbugs.gnu.org>; Fri, 14 Apr 2023 21:27:56 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1681500476; bh=skk+UG7PIgjbLqROJPQA4aKddfAU+uruslK5cGNpUrc=; h=From:To:Cc:Subject:Date:From; b=n841MLTUs6+KhHu7tS5eGNQgk2LELi7qOlodJV7bwmaUHRe7zmr3Qxs0b5jitQHP+ G6ybWMw47zepvdphRHOnwFRT6fXtsNpeRTifRyaLi/zFNzLoCU2OOGdE1lqacifQVX j/qg1V0NgAlMVtgwqlwxHqK1TwkKNs7HAr+W4ywTeDV2qdn2LC4r3yZE4/s7MZpw4O Z7g8KcmCVl6amMWoOAwfizRMQG1J/eXzr1sskljiQfDvvugWQeJ9iscPOcbqn4BGE3 WGbsmJzkRHeZKMKzYnuvcDguP+VgldkhEQ6oDQC2ShytxBW8GYV4DXoTpOu3LNlLxi OGN1AZ9Qo+OBw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Pymgc3Jm5z9rxH; Fri, 14 Apr 2023 21:27:56 +0200 (CEST) From: Felix Gruber Date: Fri, 14 Apr 2023 19:27:32 +0000 Message-Id: <20230414192736.41322-7-felgru@posteo.net> In-Reply-To: <20230414192518.41188-1-felgru@posteo.net> References: <20230414192518.41188-1-felgru@posteo.net> 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/maths.scm (dune-alugrid): Update to 2.9.0. --- gnu/packages/maths.scm | 101 ++++++++++++++++++++--------------------- 1 file changed, 49 insertions(+), 52 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 020f599f70..34fb239c73 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -7064,60 +7064,57 @@ (define-public dune-localfunctions (license license:gpl2))) (define-public dune-alugrid - ;; This was the last commit on the releases/2.7 branch as of 2021-12-17, - ;; unfortunately there was no tag for any 2.7 release. - (let ((commit "51bde29a2dfa7cfac4fb73d40ffd42b9c1eb1d3d")) - (package - (name "dune-alugrid") - (version (git-version "2.7.1" "0" commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://gitlab.dune-project.org/extensions/dune-alugrid.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0z16wg6llzxs7vjg2yilg31vwnkz8k050j6bspg3blbym0razy15")))) - (build-system cmake-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-include - (lambda _ - (substitute* "dune/alugrid/test/test-alugrid.cc" - (("doc/grids/gridfactory/testgrids") - "doc/dune-grid/grids/gridfactory/testgrids")) - #t)) - (add-after 'build 'build-tests - (lambda* (#:key inputs make-flags parallel-build? #:allow-other-keys) - (setenv "CPLUS_INCLUDE_PATH" - (string-append (assoc-ref inputs "dune-grid") "/share")) - (apply invoke "make" "build_tests" - `(,@(if parallel-build? - `("-j" ,(number->string (parallel-job-count))) - '()) - ,@make-flags))))))) - (inputs - (list dune-common - dune-geometry - dune-grid - ;; Optional - metis - openblas - python - superlu - gmp - zlib)) - (native-inputs - (list gfortran pkg-config)) - (home-page "https://dune-project.org/") - (synopsis "Distributed and Unified Numerics Environment") - (description "ALUGrid is an adaptive, loadbalancing, unstructured + (package + (name "dune-alugrid") + (version "2.9.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.dune-project.org/extensions/dune-alugrid.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0s41jinsfpm56nx41vkmyv3y9n072ssw9hxjm7di64zcszgpjmzd")))) + (build-system cmake-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-include + (lambda _ + (substitute* "dune/alugrid/test/test-alugrid.cc" + (("doc/grids/gridfactory/testgrids") + "doc/dune-grid/grids/gridfactory/testgrids")) + #t)) + (add-after 'build 'build-tests + (lambda* (#:key inputs make-flags parallel-build? #:allow-other-keys) + (setenv "CPLUS_INCLUDE_PATH" + (string-append (assoc-ref inputs "dune-grid") "/share")) + (apply invoke "make" "build_tests" + `(,@(if parallel-build? + `("-j" ,(number->string (parallel-job-count))) + '()) + ,@make-flags))))))) + (inputs + (list dune-common + dune-geometry + dune-grid + ;; Optional + metis + openblas + python + superlu + gmp + zlib)) + (native-inputs + (list gfortran pkg-config)) + (home-page "https://dune-project.org/") + (synopsis "Distributed and Unified Numerics Environment") + (description "ALUGrid is an adaptive, loadbalancing, unstructured implementation of the DUNE grid interface supporting either simplices or cubes.") - (license license:gpl2+)))) + (license license:gpl2+))) (define-public dune-subgrid ;; This was the last commit on the releases/2.7 branch as of 2021-12-17.