From patchwork Sat Dec 18 13:36:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Gruber X-Patchwork-Id: 35380 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 DFC9E27BBEA; Sat, 18 Dec 2021 13:43:10 +0000 (GMT) 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,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, 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 2057F27BBE9 for ; Sat, 18 Dec 2021 13:43:10 +0000 (GMT) Received: from localhost ([::1]:52338 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1myZzR-000743-9e for patchwork@mira.cbaines.net; Sat, 18 Dec 2021 08:43:09 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58182) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1myZvV-0002qa-H9 for guix-patches@gnu.org; Sat, 18 Dec 2021 08:39:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:58200) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1myZvV-0003cz-8t for guix-patches@gnu.org; Sat, 18 Dec 2021 08:39:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1myZvV-0007sX-5t for guix-patches@gnu.org; Sat, 18 Dec 2021 08:39:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#46929] [PATCH v3 09/12] gnu: dune-subgrid: Update to 2.7.1. Resent-From: Felix Gruber Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 18 Dec 2021 13:39:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 46929 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 46929@debbugs.gnu.org Cc: Felix Gruber Received: via spool by 46929-submit@debbugs.gnu.org id=B46929.163983469530158 (code B ref 46929); Sat, 18 Dec 2021 13:39:05 +0000 Received: (at 46929) by debbugs.gnu.org; 18 Dec 2021 13:38:15 +0000 Received: from localhost ([127.0.0.1]:41500 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1myZuh-0007qG-BW for submit@debbugs.gnu.org; Sat, 18 Dec 2021 08:38:15 -0500 Received: from mout01.posteo.de ([185.67.36.65]:37617) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1myZuY-0007np-Ow for 46929@debbugs.gnu.org; Sat, 18 Dec 2021 08:38:07 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 29045240028 for <46929@debbugs.gnu.org>; Sat, 18 Dec 2021 14:38:01 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1639834681; bh=vlT72cG7pkJGhnXue7m/v+C4FKYesBNH4IbdohfbtFo=; h=From:To:Cc:Subject:Date:From; b=pHK4mvWh6iSE5SLgLU5EHu7+WpnfbfKBGbCwDQi0hMnyZeyAvISPvuDeryxiUhksS /amnwChyNQRXgfDo9RrdHSXWRyzdDzBaB2Gqnl1/JFmOd6WjJoMVYbPb6buM7WNCVt q6Z3cxoVxK+0ZQfbpHLylKk/Q7nJO/0+XFOC2FBQg5ZU9d74nVcHZBGW3OhZkRajdf /0SA2f2SyPlxZHE/O1dDDmtVRv4Frg8p9i/TWHLztnnvag3qk/L6Skfo8PD7yExbUZ eOgZYYniZD77q313ljD69ISSiG+NovvWa2xWg1DjQIIh7Upt00E2Sw/G7UrccXrNPU kjBsYgIHj7Ebg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4JGRkJ5b3bz9rxS; Sat, 18 Dec 2021 14:38:00 +0100 (CET) From: Felix Gruber Date: Sat, 18 Dec 2021 13:36:57 +0000 Message-Id: <20211218133700.10135-10-felgru@posteo.net> In-Reply-To: <20211218133700.10135-1-felgru@posteo.net> References: <20210520220603.20289-1-felgru@posteo.net> <20211218133700.10135-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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/maths.scm (dune-subgrid): Update to 2.7.1. [version]: Use `git-version` to compute the version string. [arguments]: Parallelize build-tests phase. --- gnu/packages/maths.scm | 75 +++++++++++++++++++++++------------------- 1 file changed, 41 insertions(+), 34 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 9874972e20..b05883fe42 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -6586,43 +6586,50 @@ cubes.") (license license:gpl2+)))) (define-public dune-subgrid - (package - (name "dune-subgrid") - (version "2.7.0-git-2103a363") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://git.imp.fu-berlin.de/agnumpde/dune-subgrid") - (commit "2103a363f32e8d7b60e66eee7ddecf969f6cf762"))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1wsjlypd3835c3arqjkw836cxx5q67zy447wa65q634lf6f6v9ia")))) - (build-system cmake-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'build 'build-tests - (lambda* (#:key make-flags #:allow-other-keys) - (apply invoke "make" "build_tests" make-flags)))))) - (inputs - (list dune-common - dune-geometry - dune-grid - ;; Optional - metis - openblas - gmp)) - (native-inputs - (list gfortran pkg-config)) - (home-page "http://numerik.mi.fu-berlin.de/dune-subgrid/index.php") - (synopsis "Distributed and Unified Numerics Environment") - (description "The dune-subgrid module marks elements of + ;; This was the last commit on the releases/2.7 branch as of 2021-12-17. + ;; Unfortunately the dune-subgrid repository contains no release tags. + (let ((commit "45d1ee9f3f711e209695deee97912f4954f7f280")) + (package + (name "dune-subgrid") + (version (git-version "2.7.1" "0" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.imp.fu-berlin.de/agnumpde/dune-subgrid") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0xjf7865wil7kzym608kv3nc3ff3m3nlqich4k9wjyvy3lz6panh")))) + (build-system cmake-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'build 'build-tests + (lambda* (#:key make-flags parallel-build? #:allow-other-keys) + (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 + gmp)) + (native-inputs + (list gfortran pkg-config)) + (home-page "http://numerik.mi.fu-berlin.de/dune-subgrid/index.php") + (synopsis "Distributed and Unified Numerics Environment") + (description "The dune-subgrid module marks elements of another hierarchical dune grid. The set of marked elements can then be accessed as a hierarchical dune grid in its own right. Dune-Subgrid provides the full grid interface including adaptive mesh refinement.") - (license license:gpl2+))) + (license license:gpl2+)))) (define-public dune-typetree (package