diff options
| author | Marius Bakke <marius@gnu.org> | 2022-07-21 23:52:47 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2022-07-21 23:52:47 +0200 |
| commit | abea091dbef2d44e6eb46bd2413bdf917e14d095 (patch) | |
| tree | 28f6c61dbda0acb52678944b121b66a6f50a3709 /gnu/packages/maths.scm | |
| parent | 3b20467807c32aeac56bbbe22ffb8823f68e282b (diff) | |
| parent | 3f171587bc6a47bb056f3e699e17e05f5832aea5 (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/maths.scm')
| -rw-r--r-- | gnu/packages/maths.scm | 37 |
1 files changed, 17 insertions, 20 deletions
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 83a04f7301..6a84f47468 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2953,23 +2953,21 @@ This is the certified version of the Open Cascade Technology (OCCT) library.") (define-public gmsh (package (name "gmsh") - (version "4.9.5") + (version "4.10.5") (source (origin - (method git-fetch) - (uri (git-reference - (url "https://gitlab.onelab.info/gmsh/gmsh.git") - (commit - (string-append "gmsh_" - (string-replace-substring version "." "_"))))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0asd9p64ng5l2zk5glc33x3ynnvdpndlflg3q9mr0jxr7y9x0lrm")) - (modules '((guix build utils))) - (snippet - '(begin - (delete-file-recursively "contrib/metis") - #t)))) + (method git-fetch) + (uri (git-reference + (url "https://gitlab.onelab.info/gmsh/gmsh.git") + (commit + (string-append "gmsh_" + (string-replace-substring version "." "_"))))) + (file-name (git-file-name name version)) + (sha256 + (base32 "08p39yjgf3lbnjg90skpmsq9n1a9pmwppdmy5s94dc6sq2nfr7xl")) + (modules '((guix build utils))) + (snippet + '(delete-file-recursively "contrib/metis")))) (build-system cmake-build-system) (propagated-inputs (list fltk @@ -2984,9 +2982,9 @@ This is the certified version of the Open Cascade Technology (OCCT) library.") metis opencascade-occt)) (inputs - `(("fontconfig" ,fontconfig) - ("libxft" ,libxft) - ("python" ,python))) + (list fontconfig + libxft + python)) (arguments `(#:configure-flags `("-DENABLE_SYSTEM_CONTRIB:BOOL=ON" "-DENABLE_BUILD_SHARED:BOOL=ON" @@ -3014,8 +3012,7 @@ This is the certified version of the Open Cascade Technology (OCCT) library.") "/lib/libgmsh.so"))) (substitute* "api/gmsh.py" (("find_library\\(\"gmsh\"\\)") - (simple-format #f "\"~a\"" libgmsh)))) - #t))))) + (simple-format #f "\"~a\"" libgmsh))))))))) (home-page "http://gmsh.info/") (synopsis "3D finite element grid generator") (description "Gmsh is a 3D finite element grid generator with a built-in |