futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gnu: fenics-dolfin: Update to 2019.1.0.post0.

Browse Source 
* gnu/packages/simulation.scm (fenics-dolfin): Update to 2019.1.0.post0.
[source](snippet): Remove three substitutions that are no longer needed.
[native-inputs]: Use compatible version of CATCH.
[arguments]: Use CMAKE version 3.15.5 to avoid EXCLUDE_FROM_ALL
regression.  See <https://issues.guix.gnu.org/issue/38060>.
This commit is contained in:
Paul Garlick 2020-01-22 15:14:05 +00:00
parent ec8dff8980
commit 09ecd9a794
No known key found for this signature in database
GPG Key ID: AAC7E891896B568A
1 changed files with 7 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
gnu/packages/simulation.scm
View File

@ -431,7 +431,7 @@ FFC is part of the FEniCS Project.")
(define-public fenics-dolfin (define-public fenics-dolfin
(package (package
(name "fenics-dolfin") (name "fenics-dolfin")
(version "2018.1.0.post1") (version "2019.1.0.post0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -441,7 +441,7 @@ FFC is part of the FEniCS Project.")
(file-name (string-append name "-" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"12zkk8j3xsg6l8p0ggwsl03084vlcivw4h99b7z9kndg7k89b3ya")) "1m91hwcq5gfj4qqswp8l8kj58nia48f0n4kq13w0xqj4biq7rla0"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
@ -452,30 +452,10 @@ FFC is part of the FEniCS Project.")
(("#include.*") (("#include.*")
"#include <catch.hpp>\n")) "#include <catch.hpp>\n"))
(substitute* "test/unit/cpp/CMakeLists.txt" (substitute* "test/unit/cpp/CMakeLists.txt"
;; Add extra include directories required by the unit tests. ;; Specify directory to find the header file.
(("(^target_link_libraries.*)" line)
(string-append line "\n"
"target_include_directories("
"unittests PRIVATE "
"${DOLFIN_SOURCE_DIR} "
"${DOLFIN_SOURCE_DIR}/dolfin "
"${DOLFIN_BINARY_DIR})\n"))
(("(^set\\(CATCH_INCLUDE_DIR ).*(/catch\\))" _ front back) (("(^set\\(CATCH_INCLUDE_DIR ).*(/catch\\))" _ front back)
(string-append front (string-append front
"$ENV{CATCH_DIR}" "$ENV{CATCH_DIR}/include" back "\n")))
"/include" back "\n")))
(substitute* "demo/CMakeLists.txt"
;; Add extra include directories required by the demo tests.
(("(^#find_package.*)" line)
(string-append line "\n"
"include_directories("
"${DOLFIN_SOURCE_DIR} "
"${DOLFIN_SOURCE_DIR}/dolfin "
"${DOLFIN_BINARY_DIR})\n")))
(substitute* "dolfin/nls/PETScSNESSolver.cpp"
;; Remove SNESTEST mapping. The SNESTEST symbol was removed
;; from PETSc at version 3.10.3.
((".*SNESTEST.*") "" ))
#t)))) #t))))
(build-system cmake-build-system) (build-system cmake-build-system)
(inputs (inputs
@ -492,14 +472,15 @@ FFC is part of the FEniCS Project.")
("sundials" ,sundials-openmpi) ("sundials" ,sundials-openmpi)
("zlib" ,zlib))) ("zlib" ,zlib)))
(native-inputs (native-inputs
`(("catch" ,catch-framework2) `(("catch" ,catch-framework2-1)
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))
(propagated-inputs (propagated-inputs
`(("ffc" ,python-fenics-ffc) `(("ffc" ,python-fenics-ffc)
("petsc" ,petsc-openmpi) ("petsc" ,petsc-openmpi)
("slepc" ,slepc-openmpi))) ("slepc" ,slepc-openmpi)))
(arguments (arguments
`(#:configure-flags `(#:cmake ,cmake-3.15.5
#:configure-flags
`("-DDOLFIN_ENABLE_DOCS:BOOL=OFF" `("-DDOLFIN_ENABLE_DOCS:BOOL=OFF"
"-DDOLFIN_ENABLE_HDF5:BOOL=ON" "-DDOLFIN_ENABLE_HDF5:BOOL=ON"
"-DDOLFIN_ENABLE_MPI:BOOL=ON" "-DDOLFIN_ENABLE_MPI:BOOL=ON"