[bug#56564] [PATCH 1/3] gnu: gmsh: Remove input labels.

[bug#56564] [PATCH 1/3] gnu: gmsh: Remove input labels.

[Paul A. Patience]

* gnu/packages/maths.scm (gmsh)[inputs]: Remove labels.
---
 gnu/packages/maths.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 83a04f7301..18fcf4d99b 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -2984,9 +2984,9 @@ (define-public gmsh
            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"
--
2.37.0

[bug#56564] [PATCH 2/3] gnu: gmsh: Remove trailing booleans.

[Paul A. Patience]

* gnu/packages/maths.scm (gmsh)[snippet, arguments]: Remove trailing
booleans.
---
 gnu/packages/maths.scm | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 18fcf4d99b..b3fe262204 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -2967,9 +2967,7 @@ (define-public gmsh
        (base32 "0asd9p64ng5l2zk5glc33x3ynnvdpndlflg3q9mr0jxr7y9x0lrm"))
       (modules '((guix build utils)))
       (snippet
-       '(begin
-          (delete-file-recursively "contrib/metis")
-          #t))))
+       '(delete-file-recursively "contrib/metis"))))
     (build-system cmake-build-system)
     (propagated-inputs
      (list fltk
@@ -3014,8 +3012,7 @@ (define-public gmsh
                                            "/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
--
2.37.0

[bug#56564] [PATCH 3/3] gnu: gmsh: Update to 4.10.5.

[Paul A. Patience]

* gnu/packages/maths.scm (gmsh): Update to 4.10.5.
[source]: Reindent.
---
 gnu/packages/maths.scm | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index b3fe262204..6a84f47468 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -2953,21 +2953,21 @@ (define-public opencascade-occt
 (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
-       '(delete-file-recursively "contrib/metis"))))
+       (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
--
2.37.0

bug#56564: [PATCH 3/3] gnu: gmsh: Update to 4.10.5.

[Christopher Baines]

[-- Attachment #1: Type: text/plain, Size: 338 bytes --]


"Paul A. Patience" <paul@apatience.com> writes:

> * gnu/packages/maths.scm (gmsh): Update to 4.10.5.
> [source]: Reindent.
> ---
>  gnu/packages/maths.scm | 26 +++++++++++++-------------
>  1 file changed, 13 insertions(+), 13 deletions(-)

Thanks Paul, I've pushed this patch series as
a15b769c2f81034884ef0ae7fa8c1cea8df45c56.

Chris

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]