From patchwork Fri Sep 29 09:03:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: reza X-Patchwork-Id: 54386 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 72D3527BBE2; Fri, 29 Sep 2023 10:04:26 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B922027BBEA for ; Fri, 29 Sep 2023 10:04:21 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qm9PZ-0008Sw-2B; Fri, 29 Sep 2023 05:03:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qm9PX-0008QX-DI for guix-patches@gnu.org; Fri, 29 Sep 2023 05:03:47 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qm9PX-0000Ly-4m for guix-patches@gnu.org; Fri, 29 Sep 2023 05:03:47 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qm9Pl-0004IL-Oy for guix-patches@gnu.org; Fri, 29 Sep 2023 05:04:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66262] [PATCH 1/3] gnu: Add openfoam-package. Resent-From: reza Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 29 Sep 2023 09:04:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66262 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66262@debbugs.gnu.org <66262@debbugs.gnu.org> Cc: reza Received: via spool by 66262-submit@debbugs.gnu.org id=B66262.169597822016450 (code B ref 66262); Fri, 29 Sep 2023 09:04:01 +0000 Received: (at 66262) by debbugs.gnu.org; 29 Sep 2023 09:03:40 +0000 Received: from localhost ([127.0.0.1]:55134 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qm9PP-0004HF-Up for submit@debbugs.gnu.org; Fri, 29 Sep 2023 05:03:40 -0400 Received: from a51-70.smtp-out.eu-west-1.amazonses.com ([54.240.51.70]:37125) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <0102018ae02d5cf3-daa763af-7aa9-431f-8361-5a09dff2e565-000000@mail.housseini.me>) id 1qm9PN-0004Gp-EH for 66262@debbugs.gnu.org; Fri, 29 Sep 2023 05:03:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=solmzk3ljecfoypi3q6x2mqs3bucnhjw; d=housseini.me; t=1695978184; h=Subject:From:To:Cc:Date:Mime-Version:Content-Type:Content-Transfer-Encoding:In-Reply-To:References:Message-Id; bh=2gK9G3Vxt+JolHbj69DjVYpxP/atkiIbQI5LZ9L8vB8=; b=DJdfft9VwiOE6DeNuu+bBEjwhiFt1wDnbiLQT2+9NxOfk7EYd/1KsO8LmPq2ttuP 6w+EsYXkhPVeAPebRqkuWAiSICN9wMUREJ0yBOD7GrazVm2p24RMqLAHgkAusCpOiVq 8ftaXR1ym4Rmq48FCNSSVpO6eKSMNs8iW5zfeqPs= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=shh3fegwg5fppqsuzphvschd53n6ihuv; d=amazonses.com; t=1695978184; h=Subject:From:To:Cc:Date:Mime-Version:Content-Type:Content-Transfer-Encoding:In-Reply-To:References:Message-Id:Feedback-ID; bh=2gK9G3Vxt+JolHbj69DjVYpxP/atkiIbQI5LZ9L8vB8=; b=j9c4scLXf0xku2qZm95+nEbfOlD5529NFNmFULBUutxwUwxurocUQKE+YCNkVmP8 UxeFLa73WZ3pFcUtzzAK9DndWz7AzG2waTLVHxTQu1iY1LnTccIEfQfV3nmaYbqLkDq 7WptVFYzI9+nRD8a5J+DGp3n3NnDfh/r5G1XAueg= Date: Fri, 29 Sep 2023 09:03:03 +0000 Mime-Version: 1.0 In-Reply-To: References: <08d37437f0611551d403bb7da15d78c94fe3791f.1695977095.git.reza@housseini.me> X-Mailer: Amazon WorkMail Thread-Index: AQHZ8rNo+fS4zZNERYy4L7/bc9dU1QAAFgxi Thread-Topic: [PATCH 1/3] gnu: Add openfoam-package. X-Wm-Sent-Timestamp: 1695978182 X-Original-Mailer: git-send-email 2.41.0 Message-ID: <0102018ae02d5cf3-daa763af-7aa9-431f-8361-5a09dff2e565-000000@eu-west-1.amazonses.com> Feedback-ID: 1.eu-west-1.b24dn6frgCi6dh20skzbuMRr7UL8M6Soir/3ogtEjHQ=:AmazonSES X-SES-Outgoing: 2023.09.29-54.240.51.70 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: reza X-ACL-Warn: , reza via Guix-patches X-Patchwork-Original-From: reza via Guix-patches via From: reza Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/simulation.scm (openfoam-package): Add factory function to generate openfoam packages. Improve build tree clean up. --- gnu/packages/simulation.scm | 295 ++++++++++++++++++++++++++++++++++++ 1 file changed, 295 insertions(+) -- 2.41.0 diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm index 1dd6dc63f7..0d52434fac 100644 --- a/gnu/packages/simulation.scm +++ b/gnu/packages/simulation.scm @@ -431,6 +431,301 @@ (define-public openfoam-com (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))) + (pv-plugin-path + (string-append install-path + "/platforms/linux64GccDPInt32Opt/lib/paraview-" + paraview-version))) + (package + (name name) + (version version) + (source source) + (build-system gnu-build-system) + (native-search-paths + (list (search-path-specification + (variable "WM_PROJECT_DIR") + (files `(,install-path))) + ;; add PV_PLUGIN_PATH to LD_LIBRARY_PATH so paraview + ;; finds the OpenFOAM PV plugins + (search-path-specification + (variable "LD_LIBRARY_PATH") + (files `(,pv-plugin-path))))) + (inputs (list boost + cgal + git + gmp + libxt + metis + mpfr + ncurses + openmpi + openssh + paraview + pt-scotch32 + readline + scotch + zlib)) + (native-inputs (list bison + flex + ;; paraview plugin dependencies + cli11 + cmake-minimal + cgns + curl + double-conversion + eigen + expat + ffmpeg + fmt + freetype + gdal + gl2ps + glew + gmsh + hdf5 + jsoncpp + libjpeg-turbo + libogg + libpng + libharu + libtheora + libtiff + libx11 + libxml2 + lz4 + netcdf + nlohmann-json + proj + protobuf + pugixml + python + python-mpi4py + qtbase-5 + qtsvg-5 + qttools-5 + qtwebengine-5 + qtxmlpatterns + utfcpp + vtk + xz)) + (propagated-inputs (list gnuplot)) + (outputs '("debug" ;~60MB + "out")) + (arguments + (list + ;; Executable files and shared libraries are located in the 'platforms' + ;; subdirectory. + #:strip-directories + #~(list (string-append "OpenFOAM-" #$version "/platforms/linux64GccDPInt32Opt/bin") + (string-append "OpenFOAM-" #$version "/platforms/linux64GccDPInt32Opt/lib")) + + #:modules + '((ice-9 ftw) + (ice-9 regex) + (ice-9 string-fun) + (srfi srfi-1) + (guix build gnu-build-system) + (guix build utils)) + + #:phases + #~(modify-phases %standard-phases + (add-before 'build 'patch-HOME-path + (lambda _ + (setenv "HOME" "/tmp") #t)) + (add-before 'build 'patch-scotch + (lambda _ + (substitute* "etc/config.sh/scotch" + (("^export SCOTCH_VERSION=scotch_.*$") + (string-append "export SCOTCH_VERSION=scotch_" + #$(package-version pt-scotch32) "\n")) + (("^export SCOTCH_ARCH_PATH=.*$") + (string-append "export SCOTCH_ARCH_PATH=" #$pt-scotch32 "\n"))) + #t)) + (add-before 'build 'patch-mpi + (lambda _ + (let* ((mpi-version #$(package-version openmpi))) + ;; specify openmpi type + (substitute* "etc/bashrc" + (("WM_MPLIB=SYSTEMOPENMPI") + "WM_MPLIB=OPENMPI")) + (substitute* "etc/config.sh/mpi" + (("export FOAM_MPI=openmpi-.*$") + (string-append "export FOAM_MPI=openmpi-" + mpi-version "\n")) + (("export MPI_ARCH_PATH=.*\\$FOAM_MPI.*$") + (string-append "export MPI_ARCH_PATH=" #$openmpi "\n")))) + #t)) + (add-before 'build 'patch-paraview + (lambda _ + (substitute* "etc/config.sh/paraview" + (("^export ParaView_VERSION=.*$") + (string-append "export ParaView_VERSION=" + #$(package-version paraview) "\n")) + (("^export ParaView_DIR=.*$") + (string-append "export ParaView_DIR=" #$paraview "\n")) + (("export ParaView_GL=mesa") "export ParaView_GL=system")) + #t)) + (add-before 'build 'add-rpaths + (lambda _ + (letrec* ((libraries '("boost" + "cgal" + "gmp" + "metis" + "mpfr" + "scotch" + "pt-scotch32" + "openmpi" + "zlib" + "paraview")) + (rpaths + (fold-right (lambda (lib rpaths) + (string-append rpaths + "-rpath=" + (assoc-ref %build-inputs lib) + "/lib,")) "" libraries)) + (openfoam-lib + (string-append #$output + "/share/OpenFOAM-" #$version + "/platforms/linux64GccDPInt32Opt/lib")) + (ldflags + (string-append "-Wl," + rpaths + "-rpath=" + openfoam-lib + "," + "-rpath=" + openfoam-lib + "/dummy," + "-rpath=" + openfoam-lib + "/paraview-" + #$(version-major+minor (package-version + paraview))))) + (substitute* "wmake/rules/linux64Gcc/c++" + (("\\$\\(LIB_HEADER_DIRS\\) -fPIC" all) + (string-append all " " ldflags)))) #t)) + (add-before 'build 'add-vtk-include-path + (lambda _ + (let* ((vtk-version #$(version-major+minor + (package-version vtk))) + (vtk-inc (string-append #$vtk "/include/vtk-" vtk-version)) + (vtk-inc-flag (string-append "-I" vtk-inc))) + (substitute* "wmake/rules/linux64Gcc/c++" + (("\\$\\(LIB_HEADER_DIRS\\)" all) + (string-append all " " vtk-inc-flag " ")))) + #t)) + (delete 'configure) ;no configure phase + (replace 'build + (lambda _ + ;; compile OpenFOAM libraries and applications + (invoke "bash" "-c" + (format #f + "source ./etc/bashrc && ./Allwmake -j~a" + (parallel-job-count))))) + (add-after 'build 'cleanup + ;; Avoid unnecessary, voluminous object and dep files. + (lambda _ + (when (file-exists? "platforms/linux64GccDPInt32Opt/src") + (delete-file-recursively + "platforms/linux64GccDPInt32Opt/src")) + (when (file-exists? + "platforms/linux64GccDPInt32OptOPENMPI") + (delete-file-recursively + "platforms/linux64GccDPInt32OptOPENMPI")) + (for-each delete-file + (find-files "." "\\.o$")) + ;; Remove spurious files in src tree + (invoke "bash" "-c" "source ./etc/bashrc && wclean all") + #t)) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (when (file-exists? "test") + (with-directory-excursion "test" + (invoke "bash" "-c" + (format #f + "source ../etc/bashrc && ./Allrun -j~a" + (parallel-job-count))) + ;; cleanup + (invoke "bash" "-c" + "source ../etc/bashrc && ./Allclean"))) + ;; too many tutorials are failing + ;; (with-directory-excursion "tutorials" + ;; (invoke "bash" "-c" "source ../etc/bashrc && ./Alltest")) + ) #t)) + (add-before 'install 'set-paths + (lambda _ + (let ((install-path (string-append #$output + "/share/OpenFOAM-" #$version))) + (substitute* "etc/bashrc" + (("^\\[ \"\\$BASH\".*$") "") + (("^export FOAM_INST_DIR=\\$\\(cd.*$") + (string-append "export FOAM_INST_DIR=" install-path "\n")) + (("^export FOAM_INST_DIR=\\$HOME.*$") ""))) + #t)) + (replace 'install + (lambda* (#:key outputs inputs #:allow-other-keys) + (let ((install-path (string-append #$output + "/share/OpenFOAM-" #$version))) + (mkdir-p install-path) ;create install directory + ;; move contents of build directory to install directory + (copy-recursively "." install-path)))) + (add-after 'install 'add-symbolic-link + (lambda _ + (let* ((bin (string-append #$output "/bin")) + (lib (string-append #$output "/lib")) + (openfoam (string-append #$output + "/share/OpenFOAM-" #$version)) + (build-bin (string-append openfoam + "/platforms/linux64GccDPInt32Opt/bin")) + (build-lib (string-append openfoam + "/platforms/linux64GccDPInt32Opt/lib")) + (foam-bin (string-append openfoam "/bin"))) + ;; add symbolic links in standard 'bin' directory + (mkdir-p bin) + (for-each (lambda (file) + (unless (member file + '("." "..")) + (symlink (string-append build-bin "/" + file) + (string-append bin "/" file)))) + (scandir build-bin)) + (for-each (lambda (file) + (unless (member file + '("." "..")) + (symlink (string-append foam-bin "/" + file) + (string-append bin "/" file)))) + (scandir foam-bin)) + ;; add symbolic link for standard 'lib' directory + (symlink build-lib lib)) #t))))) + ;; Note: + ;; Tutorial files are installed read-only in /gnu/store. + ;; To allow write permissions on files copied from the store a + ;; 'chmod' step is needed before running the applications. For + ;; example, from a user's login: + ;; $ source $WM_PROJECT_DIR/etc/bashrc + ;; $ mkdir -p $FOAM_RUN + ;; $ cd $FOAM_RUN + ;; $ cp -r $FOAM_TUTORIALS/incompressible/simpleFoam/pitzDaily . + ;; $ cd pitzDaily + ;; $ chmod -R u+w . + ;; $ blockMesh + (synopsis synopsis) + (description + "OpenFOAM provides a set of solvers and methods for tackling +problems in the field of Computational Fluid Dynamics (CFD). It is written in +C++. Governing equations such as the Navier-Stokes equations can be solved in +integral form. Physical processes such as phase change, droplet transport and +chemical reaction can be modelled. Numerical methods are included to deal with +sharp gradients, such as those encountered in flows with shock waves and flows +with gas/liquid interfaces. Large problems may be split into smaller, connected +problems for efficient solution on parallel systems.") + (license license:gpl3+) + (home-page home-page)))) + (define-public open-simulation-interface (package (name "open-simulation-interface") From patchwork Fri Sep 29 09:03:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: reza X-Patchwork-Id: 54385 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 6450F27BBE9; Fri, 29 Sep 2023 10:04:23 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,PDS_BAD_THREAD_QP_64,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5FA3227BBE2 for ; Fri, 29 Sep 2023 10:04:21 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qm9Pa-0008TH-6M; Fri, 29 Sep 2023 05:03:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qm9PY-0008ST-BI for guix-patches@gnu.org; Fri, 29 Sep 2023 05:03:48 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qm9PX-0000Nm-Vl for guix-patches@gnu.org; Fri, 29 Sep 2023 05:03:48 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qm9Pm-0004IZ-KJ for guix-patches@gnu.org; Fri, 29 Sep 2023 05:04:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66262] [PATCH 2/3] gnu: openfoam-org: Update to 11. Resent-From: reza Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 29 Sep 2023 09:04:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66262 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66262@debbugs.gnu.org <66262@debbugs.gnu.org> Cc: reza Received: via spool by 66262-submit@debbugs.gnu.org id=B66262.169597823416492 (code B ref 66262); Fri, 29 Sep 2023 09:04:02 +0000 Received: (at 66262) by debbugs.gnu.org; 29 Sep 2023 09:03:54 +0000 Received: from localhost ([127.0.0.1]:55140 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qm9Pd-0004Ht-66 for submit@debbugs.gnu.org; Fri, 29 Sep 2023 05:03:54 -0400 Received: from a2-20.smtp-out.eu-west-1.amazonses.com ([54.240.2.20]:34841) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <0102018ae02d6cd5-6d828014-3023-41e1-995a-2f43d483563f-000000@mail.housseini.me>) id 1qm9PT-0004H7-Ez for 66262@debbugs.gnu.org; Fri, 29 Sep 2023 05:03:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=solmzk3ljecfoypi3q6x2mqs3bucnhjw; d=housseini.me; t=1695978188; h=Subject:From:To:Cc:Date:Mime-Version:Content-Type:Content-Transfer-Encoding:In-Reply-To:References:Message-Id; bh=WjCm40kImUr8kAZ12GUUZRqMYbfuljA/Z/Fai6hNSek=; b=YnMnho6+fsEaaM1NI6LKNqVrp7EeHQxKjJxc2QCwL3lwavsHI4PRJufSXeZqaoQ5 xiGxmld8ImZS2T86wxJRpKhu5LAqcuO52Oo5mxeFwVrHal2FG4fDnyXyINbMA5bDWcM nHTmJ7LuQPmdQSU9i1Bg3iEUxoPQPc559nN4SWWo= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=shh3fegwg5fppqsuzphvschd53n6ihuv; d=amazonses.com; t=1695978188; h=Subject:From:To:Cc:Date:Mime-Version:Content-Type:Content-Transfer-Encoding:In-Reply-To:References:Message-Id:Feedback-ID; bh=WjCm40kImUr8kAZ12GUUZRqMYbfuljA/Z/Fai6hNSek=; b=ZKbaP7NGgW8rtOAeOrCxwx82SCfh9doYOwcGchXF/E0r7HZCRWfCmZoKMq6Pfq/W 4I76yyRqMBgL+I3WJ0Q74DHn0oM3JKrw7SiDmErPrwDf/N6Y1j3gY4nPq0QWofmV4sj AHXb+inDN+87TiPvFwhShFtfTYdH81arE386HJqw= Date: Fri, 29 Sep 2023 09:03:07 +0000 Mime-Version: 1.0 In-Reply-To: References: <3c9e2eabdc2f10db9d2a51d82203fcefd5e5e218.1695977095.git.reza@housseini.me> X-Mailer: Amazon WorkMail Thread-Index: AQHZ8rNo+fS4zZNERYy4L7/bc9dU1QAAFqWL Thread-Topic: [PATCH 2/3] gnu: openfoam-org: Update to 11. X-Wm-Sent-Timestamp: 1695978186 X-Original-Mailer: git-send-email 2.41.0 Message-ID: <0102018ae02d6cd5-6d828014-3023-41e1-995a-2f43d483563f-000000@eu-west-1.amazonses.com> Feedback-ID: 1.eu-west-1.b24dn6frgCi6dh20skzbuMRr7UL8M6Soir/3ogtEjHQ=:AmazonSES X-SES-Outgoing: 2023.09.29-54.240.2.20 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: reza X-ACL-Warn: , reza via Guix-patches X-Patchwork-Original-From: reza via Guix-patches via From: reza Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/simulation.scm (openfoam-org): Update to 11. Use openfoam-package factory function to create package. --- gnu/packages/simulation.scm | 364 ++++++------------------------------ 1 file changed, 54 insertions(+), 310 deletions(-) -- 2.41.0 diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm index 0d52434fac..3db58813d3 100644 --- a/gnu/packages/simulation.scm +++ b/gnu/packages/simulation.scm @@ -87,316 +87,6 @@ (define-module (gnu packages simulation) #:use-module (ice-9 regex) #:use-module (srfi srfi-1)) -(define-public openfoam-org - (package - (name "openfoam-org") - (version "10.20230119") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/OpenFOAM/OpenFOAM-" - (version-major version) "/archive/" - (second (string-split version #\.)) - ".tar.gz")) - (sha256 - (base32 - "1aw2vb5s7frg942ngd5x5x2dm67liyg6czff56qi567mshccpy46")) - (modules '((guix build utils))) - (snippet `(begin - ;; patch shell paths - (substitute* (list "wmake/src/Makefile" - "wmake/makefiles/general") - (("/bin/sh") - "sh")) - (substitute* "etc/bashrc" - ;; only go back one folder level - (("\\$\\(dirname \\$\\{BASH_SOURCE:-\\$0\\}\\)/../..") - "$(dirname ${BASH_SOURCE:-$0})/..") - ;; do not use openfoam folder convention - (("^export WM_PROJECT_DIR=.*$") - (string-append - "export WM_PROJECT_DIR=$WM_PROJECT_INST_DIR\n")) - ;; do not source bash_completion (gives error) - (("^.*bash_completion.*$" all) - (string-append "#" all)) - ;; set same version as guix package - (("^export WM_PROJECT_VERSION=.*$") - (string-append "export WM_PROJECT_VERSION=" - ,version "\n"))) - ;; add expand flag to RunFunctions - (substitute* "bin/tools/RunFunctions" - (("foamDictionary (.*)" all args) - (string-append "foamDictionary -expand " args))) - ;; disable failing test - (substitute* "test/postProcessing/channel/Allrun" - (("^.*getApplication.*$" all) - (string-append "#" all "\n"))))))) - (build-system gnu-build-system) - (inputs (list boost - cgal - git - gmp - libxt - metis - mpfr - ncurses - openmpi - openssh - paraview - pt-scotch32 - readline - zlib)) - (native-inputs (list bison - flex - ;; paraview plugin dependencies - cli11 - cmake-minimal - cgns - curl - double-conversion - eigen - expat - ffmpeg - fmt - freetype - gdal - gl2ps - glew - gmsh - hdf5 - jsoncpp - libjpeg-turbo - libogg - libpng - libharu - libtheora - libtiff - libx11 - libxml2 - lz4 - netcdf - nlohmann-json - proj - protobuf - pugixml - python - python-mpi4py - qtbase-5 - qtsvg-5 - qttools-5 - qtwebengine-5 - qtxmlpatterns - utfcpp - vtk - xz)) - (propagated-inputs (list gnuplot)) - (outputs '("debug" ;~60MB - "out")) - (arguments - (list - ;; Executable files and shared libraries are located in the 'platforms' - ;; subdirectory. - #:strip-directories - #~(list "share/OpenFOAM/platforms/linux64GccDPInt32Opt/bin" - "share/OpenFOAM/platforms/linux64GccDPInt32Opt/lib") - - #:modules - '((ice-9 ftw) - (ice-9 regex) - (ice-9 string-fun) - (srfi srfi-1) - (guix build gnu-build-system) - (guix build utils)) - - #:phases - #~(modify-phases %standard-phases - (add-before 'build 'patch-HOME-path - (lambda _ - (setenv "HOME" "/tmp") #t)) - (add-before 'build 'patch-scotch - (lambda _ - (substitute* "etc/config.sh/scotch" - (("^export SCOTCH_VERSION=scotch_.*$") - (string-append "export SCOTCH_VERSION=scotch_" - #$(package-version pt-scotch32) "\n")) - (("^export SCOTCH_ARCH_PATH=.*$") - (string-append "export SCOTCH_ARCH_PATH=" - (assoc-ref %build-inputs "pt-scotch32") - "\n"))) #t)) - (add-before 'build 'patch-mpi - (lambda _ - (let* ((mpi-path (assoc-ref %build-inputs "openmpi")) - (mpi-version #$(package-version openmpi))) - ;; specify openmpi type - (substitute* "etc/bashrc" - (("WM_MPLIB=SYSTEMOPENMPI") - "WM_MPLIB=OPENMPI")) - (substitute* "etc/config.sh/mpi" - (("export FOAM_MPI=openmpi-.*$") - (string-append "export FOAM_MPI=openmpi-" - mpi-version "\n")) - (("export MPI_ARCH_PATH=.*\\$FOAM_MPI.*$") - (string-append "export MPI_ARCH_PATH=" mpi-path - "\n")))) #t)) - (add-before 'build 'patch-paraview - (lambda _ - (substitute* "etc/config.sh/paraview" - (("^export ParaView_VERSION=.*$") - (string-append "export ParaView_VERSION=" - #$(package-version paraview) "\n")) - (("^export ParaView_DIR=.*$") - (string-append "export ParaView_DIR=" - (assoc-ref %build-inputs "paraview") - "\n"))) #t)) - (add-before 'build 'add-rpaths - (lambda _ - (letrec* ((libraries '("boost" "cgal" - "gmp" - "metis" - "mpfr" - "pt-scotch32" - "openmpi" - "zlib" - "paraview")) - (rpaths - (fold-right (lambda (library rpaths) - (string-append rpaths - "-rpath=" - (assoc-ref - %build-inputs library) - "/lib,")) "" libraries)) - (openfoam-lib - (string-append #$output - "/share/OpenFOAM/platforms/linux64GccDPInt32Opt/lib")) - (ldflags - (string-append "-Wl," - rpaths - "-rpath=" - openfoam-lib - "," - "-rpath=" - openfoam-lib - "/dummy," - "-rpath=" - openfoam-lib - "/paraview-" - #$(version-major+minor (package-version - paraview))))) - (substitute* "wmake/rules/linux64Gcc/c++" - (("\\$\\(LIB_HEADER_DIRS\\) -fPIC" all) - (string-append all " " ldflags)))) #t)) - (add-before 'build 'add-vtk-include-path - (lambda _ - (let* ((vtk-version #$(version-major+minor - (package-version vtk))) - (vtk-root (assoc-ref %build-inputs "vtk")) - (vtk-inc (string-append vtk-root "/include/vtk-" vtk-version)) - (vtk-inc-flag (string-append "-I" vtk-inc))) - (substitute* "wmake/rules/linux64Gcc/c++" - (("\\$\\(LIB_HEADER_DIRS\\)" all) - (string-append all " " vtk-inc-flag " ")))) - #t)) - (delete 'configure) ;no configure phase - (replace 'build - (lambda _ - ;; compile OpenFOAM libraries and applications - (invoke "bash" "-c" - (format #f - "source ./etc/bashrc && ./Allwmake -j~a" - (parallel-job-count))))) - (add-after 'build 'cleanup - ;; Avoid unnecessary, voluminous object and dep files. - (lambda _ - (when (file-exists? "platforms/linux64GccDPInt32Opt/src") - (delete-file-recursively - "platforms/linux64GccDPInt32Opt/src")) - (when (file-exists? - "platforms/linux64GccDPInt32OptOPENMPI") - (delete-file-recursively - "platforms/linux64GccDPInt32OptOPENMPI")) - (for-each delete-file - (find-files "." "\\.o$")) #t)) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (when (file-exists? "test") - (with-directory-excursion "test" - (invoke "bash" "-c" - (format #f - "source ../etc/bashrc && ./Allrun -j~a" - (parallel-job-count))))) - ;; too many tutorials are failing - ;; (with-directory-excursion "tutorials" - ;; (invoke "bash" "-c" "source ../etc/bashrc && ./Alltest")) - ) #t)) - (replace 'install - (lambda _ - (let ((install-dir (string-append #$output - "/share/OpenFOAM"))) - (mkdir-p install-dir) ;create install directory - ;; move contents of build directory to install directory - (copy-recursively "." install-dir)))) - (add-after 'install 'add-symbolic-link - (lambda _ - (let* ((bin (string-append #$output "/bin")) - (lib (string-append #$output "/lib")) - (openfoam (string-append #$output - "/share/OpenFOAM")) - (build-bin (string-append openfoam - "/platforms/linux64GccDPInt32Opt/bin")) - (build-lib (string-append openfoam - "/platforms/linux64GccDPInt32Opt/lib")) - (foam-bin (string-append openfoam "/bin"))) - ;; add symbolic links in standard 'bin' directory - (mkdir-p bin) - (for-each (lambda (file) - (unless (member file - '("." "..")) - (symlink (string-append build-bin "/" - file) - (string-append bin "/" file)))) - (scandir build-bin)) - (for-each (lambda (file) - (unless (member file - '("." "..")) - (symlink (string-append foam-bin "/" - file) - (string-append bin "/" file)))) - (scandir foam-bin)) - ;; add symbolic link for standard 'lib' directory - (symlink build-lib lib)) #t))))) - (native-search-paths - (list (search-path-specification - (variable "WM_PROJECT_DIR") - (separator #f) - (files '("share/OpenFOAM"))))) - ;; Note: - ;; Tutorial files are installed read-only in /gnu/store. - ;; To allow write permissions on files copied from the store a - ;; 'chmod' step is needed before running the applications. For - ;; example, from a user's login: - ;; $ source $(dirname $(which blockMesh))/../../../etc/bashrc - ;; $ mkdir -p $FOAM_RUN - ;; $ cd $FOAM_RUN - ;; $ cp -r $FOAM_TUTORIALS/incompressible/simpleFoam/pitzDaily . - ;; $ cd pitzDaily - ;; $ chmod -R u+w . - ;; $ blockMesh - (synopsis "Framework for numerical simulation of fluid flow") - (description - "OpenFOAM provides a set of solvers and methods for tackling -problems in the field of Computational Fluid Dynamics (CFD). It is written in -C++. Governing equations such as the Navier-Stokes equations can be solved in -integral form. Physical processes such as phase change, droplet transport and -chemical reaction can be modelled. Numerical methods are included to deal with -sharp gradients, such as those encountered in flows with shock waves and flows -with gas/liquid interfaces. Large problems may be split into smaller, connected -problems for efficient solution on parallel systems.") - (license license:gpl3+) - (home-page "https://openfoam.org"))) - -(define-public openfoam - (deprecated-package "openfoam" openfoam-org)) - (define-public openfoam-com ;; This is a fork of 'openfoam-org', maintained separately. (package @@ -726,6 +416,60 @@ (define* (openfoam-package source version name home-page synopsis) (license license:gpl3+) (home-page home-page)))) +(define-public openfoam-org + (let* ((version "11") + (name "openfoam-org") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/OpenFOAM/OpenFOAM-" + (version-major version) + "/archive/" + "version-" + (version-major version) + ".tar.gz")) + (sha256 (base32 + "1h70a5ni2psx7bcx2xg6aqraj2kkbfn8mflh2akbp6k9mmpgih7b")) + (modules '((guix build utils))) + (snippet `(begin + ;; patch shell paths + (substitute* (list "wmake/src/Makefile" + "wmake/makefiles/general") + (("/bin/sh") + "sh")) + (substitute* "etc/bashrc" + ;; only go back one folder level + (("\\$\\(dirname \\$\\{BASH_SOURCE:-\\$0\\}\\)/../..") + "$(dirname ${BASH_SOURCE:-$0})/..") + ;; do not use openfoam folder convention + (("^export WM_PROJECT_DIR=.*$") + (string-append + "export WM_PROJECT_DIR=$WM_PROJECT_INST_DIR +")) + ;; do not source bash_completion (gives error) + (("^.*bash_completion.*$" all) + (string-append "#" all)) + ;; set same version as guix package + (("^export WM_PROJECT_VERSION=.*$") + (string-append "export WM_PROJECT_VERSION=" + ,version "\n"))) + ;; add expand flag to RunFunctions + (substitute* "bin/tools/RunFunctions" + (("foamDictionary (.*)" all args) + (string-append "foamDictionary -expand " + args))) + ;; disable failing test + (substitute* "test/postProcessing/channel/Allrun" + (("^.*getApplication.*$" all) + (string-append "#" all "\n"))))))) + (home-page "https://openfoam.org") + (synopsis "Framework for numerical simulation of fluid flow") + (template (openfoam-package source version name home-page synopsis))) + (package + (inherit template)))) + +(define-public openfoam + (deprecated-package "openfoam" openfoam-org)) + (define-public open-simulation-interface (package (name "open-simulation-interface") From patchwork Fri Sep 29 09:03:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: reza X-Patchwork-Id: 54384 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 234F127BBEA; Fri, 29 Sep 2023 10:04:17 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,PDS_BAD_THREAD_QP_64,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1505327BBE2 for ; Fri, 29 Sep 2023 10:04:16 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qm9PZ-0008TF-VO; Fri, 29 Sep 2023 05:03:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qm9PY-0008SR-B3 for guix-patches@gnu.org; Fri, 29 Sep 2023 05:03:48 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qm9PX-0000Mq-Vl for guix-patches@gnu.org; Fri, 29 Sep 2023 05:03:48 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qm9Pm-0004IS-80 for guix-patches@gnu.org; Fri, 29 Sep 2023 05:04:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66262] [PATCH 3/3] gnu: openfoam-com: Update to 2306. Resent-From: reza Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 29 Sep 2023 09:04:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66262 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66262@debbugs.gnu.org <66262@debbugs.gnu.org> Cc: reza Received: via spool by 66262-submit@debbugs.gnu.org id=B66262.169597822816475 (code B ref 66262); Fri, 29 Sep 2023 09:04:02 +0000 Received: (at 66262) by debbugs.gnu.org; 29 Sep 2023 09:03:48 +0000 Received: from localhost ([127.0.0.1]:55138 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qm9PX-0004Ha-Lb for submit@debbugs.gnu.org; Fri, 29 Sep 2023 05:03:48 -0400 Received: from a51-4.smtp-out.eu-west-1.amazonses.com ([54.240.51.4]:44335) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <0102018ae02d7aa4-d0e2bf8f-5c3c-40c8-bef4-1f6c8074bf96-000000@mail.housseini.me>) id 1qm9PS-0004H6-Vt for 66262@debbugs.gnu.org; Fri, 29 Sep 2023 05:03:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=solmzk3ljecfoypi3q6x2mqs3bucnhjw; d=housseini.me; t=1695978191; h=Subject:From:To:Cc:Date:Mime-Version:Content-Type:Content-Transfer-Encoding:In-Reply-To:References:Message-Id; bh=q8TmJk4w0n+JjMSDQ66RoCDFEmE+DD8EfCJdkkoHhU4=; b=LnRDdoq4O+H8d9MUe3VEYzpdG/WwMt/whT0iRm73IjB3ora29yNDMvivOs/tF1Uo SCqJEaYVpp+02z59tJktmIGaBFjLZqoS5rWajzaD5Ua2dRtY7zsQrFPV1/mtRY35PLU oUbDWngI6On2y4Pcq75ighmJQghpUmPwCRADN3P0= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=shh3fegwg5fppqsuzphvschd53n6ihuv; d=amazonses.com; t=1695978191; h=Subject:From:To:Cc:Date:Mime-Version:Content-Type:Content-Transfer-Encoding:In-Reply-To:References:Message-Id:Feedback-ID; bh=q8TmJk4w0n+JjMSDQ66RoCDFEmE+DD8EfCJdkkoHhU4=; b=WMF5al7kiJ7dmaJOaMnKEEBZXyTFAT2GdMJtCUnijsYfXA4QTZ1emSW2M0tdxY+i Mk6um8ulefpAJvtDfnUAdDjqhQUiZPfII9amf2Hwi7nbuFxabwhduy1KYTcldFYaPbS fKDaDIGkLEgipvQNwRl8Hm0ebYLEy5n6A2rF8A2A= Date: Fri, 29 Sep 2023 09:03:11 +0000 Mime-Version: 1.0 In-Reply-To: References: X-Mailer: Amazon WorkMail Thread-Index: AQHZ8rNo+fS4zZNERYy4L7/bc9dU1QAAFzVo Thread-Topic: [PATCH 3/3] gnu: openfoam-com: Update to 2306. X-Wm-Sent-Timestamp: 1695978190 X-Original-Mailer: git-send-email 2.41.0 Message-ID: <0102018ae02d7aa4-d0e2bf8f-5c3c-40c8-bef4-1f6c8074bf96-000000@eu-west-1.amazonses.com> Feedback-ID: 1.eu-west-1.b24dn6frgCi6dh20skzbuMRr7UL8M6Soir/3ogtEjHQ=:AmazonSES X-SES-Outgoing: 2023.09.29-54.240.51.4 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: reza X-ACL-Warn: , reza via Guix-patches X-Patchwork-Original-From: reza via Guix-patches via From: reza Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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(-) -- 2.41.0 diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm index 3db58813d3..7dd6bd3141 100644 --- a/gnu/packages/simulation.scm +++ b/gnu/packages/simulation.scm @@ -87,40 +87,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))) @@ -470,6 +436,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") From patchwork Thu Nov 30 08:57:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: reza X-Patchwork-Id: 57134 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id A0B4B27BBE9; Thu, 30 Nov 2023 08:59:22 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C8C1527BBE2 for ; Thu, 30 Nov 2023 08:59:21 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r8csq-0005lN-Hg; Thu, 30 Nov 2023 03:58:56 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r8csp-0005l6-4k for guix-patches@gnu.org; Thu, 30 Nov 2023 03:58:55 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r8cso-00048r-SF for guix-patches@gnu.org; Thu, 30 Nov 2023 03:58:54 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r8csw-0000lL-FM for guix-patches@gnu.org; Thu, 30 Nov 2023 03:59:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#66262] [PATCH v6 4/6] gnu: openfoam-org: Improve build clean up. In-Reply-To: <0102018ae02b1a04-440a9320-f59f-4304-bf10-01dfb00717ca-000000@eu-west-1.amazonses.com> Resent-From: reza Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 30 Nov 2023 08:59:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66262 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66262@debbugs.gnu.org <66262@debbugs.gnu.org> Cc: reza Received: via spool by 66262-submit@debbugs.gnu.org id=B66262.17013347002881 (code B ref 66262); Thu, 30 Nov 2023 08:59:02 +0000 Received: (at 66262) by debbugs.gnu.org; 30 Nov 2023 08:58:20 +0000 Received: from localhost ([127.0.0.1]:52225 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r8csF-0000kO-LR for submit@debbugs.gnu.org; Thu, 30 Nov 2023 03:58:19 -0500 Received: from a2-250.smtp-out.eu-west-1.amazonses.com ([54.240.2.250]:60063) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <0102018c1f72fa7b-c5c0531a-16e4-48e0-8259-5240c64d3edb-000000@mail.housseini.me>) id 1r8csD-0000kC-PA for 66262@debbugs.gnu.org; Thu, 30 Nov 2023 03:58:18 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=solmzk3ljecfoypi3q6x2mqs3bucnhjw; d=housseini.me; t=1701334678; h=Subject:From:To:Cc:Date:Mime-Version:Content-Type:Content-Transfer-Encoding:References:Message-Id; bh=zY50i4acbis6VDcLotleHuVlK9pQp2U+BWtcGUKHQ4k=; b=jA2TFzRs4ugiNAZTvdTB4VM/3mkcTwkLkgAVycPd05eYOkuhu4CTTrcogIQ/ODzD boLvzGQvV6roDIw4CYZi0xYCyX2/uYdOOjvrFpaIzSgTPZbSQeyKx8Cspsq2cB5DsHj miQgG++0TXGxBKIiG2Hwr4l5gTzExerFKPPi3GOI= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=shh3fegwg5fppqsuzphvschd53n6ihuv; d=amazonses.com; t=1701334678; h=Subject:From:To:Cc:Date:Mime-Version:Content-Type:Content-Transfer-Encoding:References:Message-Id:Feedback-ID; bh=zY50i4acbis6VDcLotleHuVlK9pQp2U+BWtcGUKHQ4k=; b=xx2hFKPSCHb1Ij+ZITYb/k8/ypxhX2wREB4jlmCKsrHicj8YHJiwguYwQOtYE92b WGD4K31dG9wSS/YPLHFhtv8qJ2iGqb5H8a51tl9/sBKxNtuX+q38cTiiTcHXM8Ad6aw 1O3iMcpCg3PIIpRErGxuj0PGgHVU/2KQEJxT2R2E= Date: Thu, 30 Nov 2023 08:57:58 +0000 Mime-Version: 1.0 References: <54b1a2d73885ed2f5fef4f74fde212f9c811ce66.1701334644.git.reza@housseini.me> X-Mailer: Amazon WorkMail Thread-Index: AQHaI2tPta8x42dCToyxR/qtEOkEUA== Thread-Topic: [PATCH v6 4/6] gnu: openfoam-org: Improve build clean up. X-Wm-Sent-Timestamp: 1701334677 X-Original-Mailer: git-send-email 2.41.0 Message-ID: <0102018c1f72fa7b-c5c0531a-16e4-48e0-8259-5240c64d3edb-000000@eu-west-1.amazonses.com> Feedback-ID: 1.eu-west-1.b24dn6frgCi6dh20skzbuMRr7UL8M6Soir/3ogtEjHQ=:AmazonSES X-SES-Outgoing: 2023.11.30-54.240.2.250 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: reza X-ACL-Warn: , reza via Guix-patches X-Patchwork-Original-From: reza via Guix-patches via From: reza Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/simulation.scm (openfoam-org): Improve build tree cleanup for package reproducibility. Change-Id: I59193f16a7d9598a9bc842f1c6091369c47906a8 --- gnu/packages/simulation.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) base-commit: cd46757c1a0f886848fbb6828c028dd2a2532767 prerequisite-patch-id: e928ac9ae5a11e33ced4f46fed14ea984b551d0c prerequisite-patch-id: ff305aca25644db4a2b385cd2a9980df4ca457d5 prerequisite-patch-id: b429416cc65454ac2af04a12b8bc93d7b87fbda8 diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm index 75eb070f64..c6041643c8 100644 --- a/gnu/packages/simulation.scm +++ b/gnu/packages/simulation.scm @@ -328,7 +328,9 @@ (define-public openfoam-org (delete-file-recursively "platforms/linux64GccDPInt32OptOPENMPI")) (for-each delete-file - (find-files "." "\\.o$")) #t)) + (find-files "." "\\.o$")) + ;; Remove spurious files in src tree + (invoke "bash" "-c" "source ./etc/bashrc && wclean all") #t)) (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? From patchwork Thu Nov 30 09:01:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: reza X-Patchwork-Id: 57135 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 0B57527BBE9; Thu, 30 Nov 2023 09:02:19 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,PDS_BAD_THREAD_QP_64,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4125F27BBE2 for ; Thu, 30 Nov 2023 09:02:18 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r8cvs-0006Ld-Ut; Thu, 30 Nov 2023 04:02:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r8cvk-0006Kl-3M for guix-patches@gnu.org; Thu, 30 Nov 2023 04:01:57 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r8cvi-0004uU-NT for guix-patches@gnu.org; Thu, 30 Nov 2023 04:01:55 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r8cvq-0000sT-Ix for guix-patches@gnu.org; Thu, 30 Nov 2023 04:02:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#66262] [PATCH v6 5/6] gnu: openfoam-org: Update to 11. In-Reply-To: <0102018ae02b1a04-440a9320-f59f-4304-bf10-01dfb00717ca-000000@eu-west-1.amazonses.com> Resent-From: reza Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 30 Nov 2023 09:02:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66262 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66262@debbugs.gnu.org <66262@debbugs.gnu.org> Cc: reza Received: via spool by 66262-submit@debbugs.gnu.org id=B66262.17013349223370 (code B ref 66262); Thu, 30 Nov 2023 09:02:02 +0000 Received: (at 66262) by debbugs.gnu.org; 30 Nov 2023 09:02:02 +0000 Received: from localhost ([127.0.0.1]:52232 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r8cvp-0000sE-ML for submit@debbugs.gnu.org; Thu, 30 Nov 2023 04:02:01 -0500 Received: from a2-14.smtp-out.eu-west-1.amazonses.com ([54.240.2.14]:37143) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <0102018c1f765fa5-2e167a23-9d58-44ab-8ca7-f4766d468af7-000000@mail.housseini.me>) id 1r8cvo-0000rx-7v for 66262@debbugs.gnu.org; Thu, 30 Nov 2023 04:02:00 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=solmzk3ljecfoypi3q6x2mqs3bucnhjw; d=housseini.me; t=1701334900; h=Subject:From:To:Cc:Date:Mime-Version:Content-Type:Content-Transfer-Encoding:References:Message-Id; bh=0tn2iItbuw2Oowyq55A+bz2rm3xFEqP6GIZXqh0ikDs=; b=CY4Mto73U0Zs7aHUTOqbgIM9jNjknrz/9jmB9aOVezEh6LxyxT+Mf8LBlGuzRcXY Qc2NbjWx6P7CPWXffdFz6R/xKG+y/teG9SIhj4En3jevtwN5pw5SBhITnX1JXJhu0qW fePVOV9Ul1IAFdIuU9dOCGj5LRCho4TY8NVbQPSk= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=shh3fegwg5fppqsuzphvschd53n6ihuv; d=amazonses.com; t=1701334900; h=Subject:From:To:Cc:Date:Mime-Version:Content-Type:Content-Transfer-Encoding:References:Message-Id:Feedback-ID; bh=0tn2iItbuw2Oowyq55A+bz2rm3xFEqP6GIZXqh0ikDs=; b=k5z4DWJtVwOo6djXqlorB39gpf43rEAJ6XFK6YOjv8USltEDdzJLGJPq0MSSgbPp I/hBCxC8MXy26X9kXxWrScKSLo7Tjw2j0+lkD1SZ69LDpy+hVSzGqneHSOFM4wTPgI5 movDJnNlwQMtKdV4MwK5MihlGta7wZa4RpIJ7Ce4= Date: Thu, 30 Nov 2023 09:01:40 +0000 Mime-Version: 1.0 References: X-Mailer: Amazon WorkMail Thread-Index: AQHaI2vUp5N769nGRKaGmlpBNQSIhg== Thread-Topic: [PATCH v6 5/6] gnu: openfoam-org: Update to 11. X-Wm-Sent-Timestamp: 1701334899 X-Original-Mailer: git-send-email 2.41.0 Message-ID: <0102018c1f765fa5-2e167a23-9d58-44ab-8ca7-f4766d468af7-000000@eu-west-1.amazonses.com> Feedback-ID: 1.eu-west-1.b24dn6frgCi6dh20skzbuMRr7UL8M6Soir/3ogtEjHQ=:AmazonSES X-SES-Outgoing: 2023.11.30-54.240.2.14 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: reza X-ACL-Warn: , reza via Guix-patches X-Patchwork-Original-From: reza via Guix-patches via From: reza Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/simulation.scm (openfoam-org): Update to 11. Change-Id: I6f9752e8bb35754ac3f67acbaa1e4ae8b216e410 --- gnu/packages/simulation.scm | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) base-commit: cd46757c1a0f886848fbb6828c028dd2a2532767 prerequisite-patch-id: e928ac9ae5a11e33ced4f46fed14ea984b551d0c prerequisite-patch-id: ff305aca25644db4a2b385cd2a9980df4ca457d5 prerequisite-patch-id: b429416cc65454ac2af04a12b8bc93d7b87fbda8 prerequisite-patch-id: f1923fb8c806820e8e71471d00fc0ab56bb4ff5c -- 2.41.0 diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm index c6041643c8..b33f24a5f4 100644 --- a/gnu/packages/simulation.scm +++ b/gnu/packages/simulation.scm @@ -91,17 +91,18 @@ (define-module (gnu packages simulation) (define-public openfoam-org (package (name "openfoam-org") - (version "10.20230119") + (version "11") (source (origin - (method git-fetch) - (uri (git-reference - (url (string-append "https://github.com/OpenFOAM/OpenFOAM-" - (version-major version))) - (commit (second (string-split version #\.))))) + (method url-fetch) + (uri (string-append "https://github.com/OpenFOAM/OpenFOAM-" + (version-major version) + "/archive/" + "version-" + (version-major version) + ".tar.gz")) (sha256 (base32 - "0icvwg7s6vnkgmdiczivia9pbrgx8nanw9a4j080fzfvdv9vxhzp")) - (file-name (git-file-name name version)) + "1h70a5ni2psx7bcx2xg6aqraj2kkbfn8mflh2akbp6k9mmpgih7b")) (modules '((guix build utils))) (snippet `(begin ;; patch shell paths From patchwork Thu Nov 30 09:03:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: reza X-Patchwork-Id: 57137 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 980D927BBEA; Thu, 30 Nov 2023 09:05:13 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C5F4027BBE2 for ; Thu, 30 Nov 2023 09:05:12 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r8cyd-0008EF-4a; Thu, 30 Nov 2023 04:04:55 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r8cyc-0008Dw-IJ for guix-patches@gnu.org; Thu, 30 Nov 2023 04:04:54 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r8cyc-0005M4-9P for guix-patches@gnu.org; Thu, 30 Nov 2023 04:04:54 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r8cyk-0000zY-75 for guix-patches@gnu.org; Thu, 30 Nov 2023 04:05:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#66262] [PATCH v6 6/6] gnu: openfoam-com: Update to 2306. In-Reply-To: <0102018ae02b1a04-440a9320-f59f-4304-bf10-01dfb00717ca-000000@eu-west-1.amazonses.com> Resent-From: reza Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 30 Nov 2023 09:05:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66262 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66262@debbugs.gnu.org <66262@debbugs.gnu.org> Cc: reza Received: via spool by 66262-submit@debbugs.gnu.org id=B66262.17013350673749 (code B ref 66262); Thu, 30 Nov 2023 09:05:02 +0000 Received: (at 66262) by debbugs.gnu.org; 30 Nov 2023 09:04:27 +0000 Received: from localhost ([127.0.0.1]:52264 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r8cy8-0000yG-4l for submit@debbugs.gnu.org; Thu, 30 Nov 2023 04:04:27 -0500 Received: from a56-18.smtp-out.eu-west-1.amazonses.com ([54.240.56.18]:42947) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <0102018c1f78439a-cee5ea9b-ddf7-4644-b038-016b4d81adf1-000000@mail.housseini.me>) id 1r8cxn-0000wT-UY for 66262@debbugs.gnu.org; Thu, 30 Nov 2023 04:04:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=solmzk3ljecfoypi3q6x2mqs3bucnhjw; d=housseini.me; t=1701335024; h=Subject:From:To:Cc:Date:Mime-Version:Content-Type:Content-Transfer-Encoding:References:Message-Id; bh=TuRPPtW3Z50YEMeUBwmZlmTNl5vEO+I7WhrFd0z8Tjw=; b=XBF9BoCW6b/8DOHq/8A8u0MliYdYDV0wYCPh8MRSzmKtLCbgYvBk5WambFMI44wf fI/sXIvZNqVVI9/VIaZM5onQO9znmjEcuI3QRxAqOY3Vc4Kyk/yOKGPGqCFougf0MCx TCO7trUyfo4zpZCDVrBWr5VfuWxamW6MWYvm6W/0= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=shh3fegwg5fppqsuzphvschd53n6ihuv; d=amazonses.com; t=1701335024; h=Subject:From:To:Cc:Date:Mime-Version:Content-Type:Content-Transfer-Encoding:References:Message-Id:Feedback-ID; bh=TuRPPtW3Z50YEMeUBwmZlmTNl5vEO+I7WhrFd0z8Tjw=; b=xdnha835BnaitZxnE/lVMqgzxSjFRRpsde0BB3yMUxe1N7LtLKMA3uV6y7voM7oy DD+1uS41mVfdNAcX5L1t1NVcSopWJNFLbk7R7wtnYK3EVZdyzWv/eNyeEgJKxBLfxF+ HNzc0rMiU64RZb6252pHrN/+4VwwdExNdJe0RPjA= Date: Thu, 30 Nov 2023 09:03:44 +0000 Mime-Version: 1.0 References: <1e5198861de5777cb1ad76b7919bc80870b54585.1701334982.git.reza@housseini.me> X-Mailer: Amazon WorkMail Thread-Index: AQHaI2weI1xYICShSXWDe7D6jmfNBQ== Thread-Topic: [PATCH v6 6/6] gnu: openfoam-com: Update to 2306. X-Wm-Sent-Timestamp: 1701335023 X-Original-Mailer: git-send-email 2.41.0 Message-ID: <0102018c1f78439a-cee5ea9b-ddf7-4644-b038-016b4d81adf1-000000@eu-west-1.amazonses.com> Feedback-ID: 1.eu-west-1.b24dn6frgCi6dh20skzbuMRr7UL8M6Soir/3ogtEjHQ=:AmazonSES X-SES-Outgoing: 2023.11.30-54.240.56.18 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: reza X-ACL-Warn: , reza via Guix-patches X-Patchwork-Original-From: reza via Guix-patches via From: reza Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/simulation.scm (openfoam-com): Update to 2306. Change-Id: I418fa263706574b716a852c77a33c7de5ee0068d --- gnu/packages/simulation.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) base-commit: cd46757c1a0f886848fbb6828c028dd2a2532767 prerequisite-patch-id: e928ac9ae5a11e33ced4f46fed14ea984b551d0c prerequisite-patch-id: ff305aca25644db4a2b385cd2a9980df4ca457d5 prerequisite-patch-id: b429416cc65454ac2af04a12b8bc93d7b87fbda8 prerequisite-patch-id: f1923fb8c806820e8e71471d00fc0ab56bb4ff5c prerequisite-patch-id: 95f7502d97cb847e3c6a53899d6513377f9475b9 diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm index b33f24a5f4..f01044e76a 100644 --- a/gnu/packages/simulation.scm +++ b/gnu/packages/simulation.scm @@ -444,7 +444,7 @@ (define-public openfoam-com (package (inherit openfoam-org) (name "openfoam-com") - (version "2212") + (version "2306") (source (origin (method url-fetch) (uri (string-append "https://develop.openfoam.com" @@ -455,7 +455,7 @@ (define-public openfoam-com ".tar.gz")) (sha256 (base32 - "0i9039hfz9gvgymkdjhjvvn5500zha3cpdbpqrzfrfi8lbz10is2")) + "0zlkp48vygl2a5cyl0mfpj8dsb5bffviq96rg3kws1l6ni40v7jr")) (modules '((guix build utils))) (snippet `(begin (substitute* "etc/bashrc"