diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2016-01-13 17:50:17 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-01-13 18:18:48 +0100 |
| commit | 8c986ab12034d67db836a881f57c69754d8073ae (patch) | |
| tree | bf5183011119695ac549d4cfff4dc2175e659397 /gnu/packages/maths.scm | |
| parent | 203795aceaabec0e0e5818e1650ad407d825d1b3 (diff) | |
| parent | 7a2eed3aac1ecd0bdf293e33a234fad58f2e5f9e (diff) | |
| download | guix-8c986ab12034d67db836a881f57c69754d8073ae.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/maths.scm')
| -rw-r--r-- | gnu/packages/maths.scm | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index e2d5aa1ff4..51d9cc1ce4 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -463,14 +463,14 @@ script files.") (define-public gmsh (package (name "gmsh") - (version "2.8.4") + (version "2.11.0") (source (origin (method url-fetch) (uri (string-append "http://www.geuz.org/gmsh/src/gmsh-" version "-source.tgz")) (sha256 - (base32 "0jv2yvk28w86rx5mvjkb0w12ff2jxih7axnpvznpd295lg5jg7hr")) + (base32 "1ilplibvjgf7a905grpnclrvkmqy9fgrpl7xyp3w4yl1qc682v9b")) (modules '((guix build utils))) (snippet ;; Remove non-free METIS code @@ -489,7 +489,15 @@ script files.") (arguments `(#:configure-flags `("-DENABLE_METIS:BOOL=OFF" "-DENABLE_BUILD_SHARED:BOOL=ON" - "-DENABLE_BUILD_DYNAMIC:BOOL=ON"))) + "-DENABLE_BUILD_DYNAMIC:BOOL=ON") + #:phases (modify-phases %standard-phases + (replace + 'check + (lambda _ + (zero? (system* "make" "test" + ;; Disable this test. See + ;; https://geuz.org/trac/gmsh/ticket/271 + "ARGS=-E component8_in_a_box"))))))) (home-page "http://www.geuz.org/gmsh/") (synopsis "3D finite element grid generator") (description "Gmsh is a 3D finite element grid generator with a built-in |