TakeV/guix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

gnu: gmsh: Update to 4.6.0.

Browse source 
Gmsh bundles METIS 5 released with Apache License 2.0 since upstream commit
eaff7f6477fe876991615cfa4b5832bd5f12994b.  Instead, Gmsh is linked with the
package 'metis'.

* gnu/packages/maths.scm (gmsh): Update to 4.6.0.
(propagated-inputs): Replace 'opencascade-oce' by 'opencascade-occt', add
'metis'.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
zimoun 2020-10-05 15:58:01 +02:00 committed by Ludovic Courtès
parent 31113b6f33
commit 229e04c66e
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gnu/packages/maths.scm
View file

@ -40,6 +40,7 @@
;;; Copyright © 2020 Nicolò Balzarotti <nicolo@nixo.xyz>
;;; Copyright © 2020 B. Wilson <elaexuotee@wilsonb.com>
;;; Copyright © 2020 Vinicius Monego <monego@posteo.net>
;;; Copyright © 2020 Simon Tournier <zimon.toutoune@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -2156,7 +2157,7 @@ (define-public opencascade-occt
(define-public gmsh
(package
(name "gmsh")
(version "2.16.0")
(version "4.6.0")
(source
(origin
(method git-fetch)
@ -2168,12 +2169,11 @@ (define-public gmsh
version)))))
(file-name (git-file-name name version))
(sha256
(base32 "08rq4jajwmlpivnm9yifz2jhaivnz065lnk0h2zv773nwl9wf162"))
(base32 "0m0pjxcy1bnr7a20i11lh0ih159pphq9wsvfjr3sfx4y3lginz5y"))
(modules '((guix build utils)))
(snippet
;; Remove non-free METIS code
'(begin
(delete-file-recursively "contrib/Metis")
(delete-file-recursively "contrib/metis")
#t))))
(build-system cmake-build-system)
(propagated-inputs
@ -2184,14 +2184,15 @@ (define-public gmsh
("lapack" ,lapack)
("mesa" ,mesa)
("glu" ,glu)
("opencascade-oce" ,opencascade-oce)
("metis" ,metis)
("opencascade-occt" ,opencascade-occt)
("libx11" ,libx11)
("libxext" ,libxext)))
(inputs
`(("fontconfig" ,fontconfig)
("libxft" ,libxft)))
(arguments
`(#:configure-flags `("-DENABLE_METIS:BOOL=OFF"
`(#:configure-flags `("-DENABLE_SYSTEM_CONTRIB:BOOL=ON"
"-DENABLE_BUILD_SHARED:BOOL=ON"
"-DENABLE_BUILD_DYNAMIC:BOOL=ON")))
(home-page "http://gmsh.info/")