Subject: [PATCH v2 3/3] gnu: openfoam-com: Update to 2306.

From: reza <[email-masked]>
Date: Fri, 29 Sep 2023 09:40:00 +0000

* gnu/packages/simulation (openfoam-com): Update to 2306. Use openfoam-package
factory function to create package.
---
 gnu/packages/simulation.scm | 70 +++++++++++++++++++------------------
 1 file changed, 36 insertions(+), 34 deletions(-)

diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm
index 4dc8c9e30e..c712693e6e 100644
--- a/gnu/packages/simulation.scm
+++ b/gnu/packages/simulation.scm
@@ -88,40 +88,6 @@ (define-module (gnu packages simulation)
   #:use-module (ice-9 regex)
   #:use-module (srfi srfi-1))
 
-(define-public openfoam-com
-  ;; This is a fork of 'openfoam-org', maintained separately.
-  (package
-    (inherit openfoam-org)
-    (name "openfoam-com")
-    (version "2212")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://develop.openfoam.com"
-                                  "/Development/openfoam/-/archive/OpenFOAM-v"
-                                  version
-                                  "/openfoam-OpenFOAM-v"
-                                  version
-                                  ".tar.gz"))
-              (sha256
-               (base32
-                "0i9039hfz9gvgymkdjhjvvn5500zha3cpdbpqrzfrfi8lbz10is2"))
-              (modules '((guix build utils)))
-              (snippet `(begin
-                          (substitute* "etc/bashrc"
-                            ;; set same version as guix package
-			    (("^export WM_PROJECT_VERSION=.*$")
-			     (string-append "export WM_PROJECT_VERSION="
-					    ,version "\n")))
-                          ;; patch shell paths
-                          (substitute* (list "src/OSspecific/POSIX/POSIX.C"
-                                             "wmake/src/Makefile"
-                                             "wmake/makefiles/general"
-                                             "wmake/makefiles/info")
-                            (("/bin/sh")
-                             "sh"))))))
-    (synopsis "Framework for numerical simulation of fluid flow (from openfoam.com)")
-    (home-page "https://www.openfoam.com")))
-
 (define* (openfoam-package source version name home-page synopsis)
   (let* ((install-path (string-append "share/OpenFOAM-" version))
          (paraview-version (version-major+minor (package-version paraview)))
@@ -471,6 +437,42 @@ (define-public openfoam-org
 (define-public openfoam
   (deprecated-package "openfoam" openfoam-org))
 
+(define-public openfoam-com
+  ;; This is a fork of 'openfoam-org', maintained separately.
+  (let* ((version "2306")
+         (name "openfoam-com")
+         (source (origin
+                   (method url-fetch)
+                   (uri (string-append "https://develop.openfoam.com"
+                                       "/Development/openfoam/-/archive/OpenFOAM-v"
+                                       version
+                                       "/openfoam-OpenFOAM-v"
+                                       version
+                                       ".tar.gz"))
+                   (sha256 (base32
+                            "0zlkp48vygl2a5cyl0mfpj8dsb5bffviq96rg3kws1l6ni40v7jr"))
+                   (modules '((guix build utils)))
+                   (snippet `(begin
+                               (substitute* "etc/bashrc"
+                                 ;; set same version as guix package
+                                 (("^export WM_PROJECT_VERSION=.*$")
+                                  (string-append "export WM_PROJECT_VERSION="
+                                                 ,version "\n")))
+                               ;; patch shell paths
+                               (substitute* (list
+                                             "src/OSspecific/POSIX/POSIX.C"
+                                             "wmake/src/Makefile"
+                                             "wmake/makefiles/general"
+                                             "wmake/makefiles/info")
+                                 (("/bin/sh")
+                                  "sh"))))))
+         (home-page "https://www.openfoam.com")
+         (synopsis
+          "Framework for numerical simulation of fluid flow (from openfoam.com)")
+         (template (openfoam-package source version name home-page synopsis)))
+    (package
+      (inherit template))))
+
 (define-public open-simulation-interface
   (package
     (name "open-simulation-interface")
-- 
2.41.0