diff options
author | Felix Gruber <felgru@posteo.net> | 2021-12-18 13:36:56 +0000 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2022-01-20 15:28:14 +0100 |
commit | fff6f00c35cf6d5e48522e2e1433c9f698d2da71 (patch) | |
tree | a7528e496d7fd02f31c4f69e59e4282ed5387b7a | |
parent | ef07f19b933c2e3e0e7219854d5acef157e8dda0 (diff) | |
download | guix-fff6f00c35cf6d5e48522e2e1433c9f698d2da71.tar guix-fff6f00c35cf6d5e48522e2e1433c9f698d2da71.tar.gz |
gnu: dune-alugrid: Update to 2.7.1.
* gnu/packages/maths.scm (dune-alugrid): Update to 2.7.1.
[version]: Use `git-version` to compute the version string.
[arguments]: Parallelize build-tests phase.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
-rw-r--r-- | gnu/packages/maths.scm | 97 |
1 files changed, 52 insertions, 45 deletions
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 8b3a939941..8f0d697f15 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -6643,53 +6643,60 @@ assemble global function spaces on finite-element grids.") (license license:gpl2))) (define-public dune-alugrid - (package - (name "dune-alugrid") - (version "2.7.0-git-81d35682") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://gitlab.dune-project.org/extensions/dune-alugrid.git") - (commit "81d356827c84454b971937db02c02b90bbcd7fe5"))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0z54lwfp53prcrs94k8gwh047l9z642jll3l56xlyfr69z0b2zz1")))) - (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 #:allow-other-keys) - (setenv "CPLUS_INCLUDE_PATH" - (string-append (assoc-ref inputs "dune-grid") "/share")) - (apply invoke "make" "build_tests" 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 + ;; 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 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 (package |