From patchwork Fri Dec 1 20:21:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: reza X-Patchwork-Id: 57180 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 CF52727BBEE; Fri, 1 Dec 2023 20:22:20 +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 D4E4727BBEA for ; Fri, 1 Dec 2023 20:22:19 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r9A1M-0004V7-Ux; Fri, 01 Dec 2023 15:21:57 -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 1r9A1K-0004U9-4K for guix-patches@gnu.org; Fri, 01 Dec 2023 15:21: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 1r9A1J-00059l-S5 for guix-patches@gnu.org; Fri, 01 Dec 2023 15:21:53 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r9A1S-0000Ze-Kw for guix-patches@gnu.org; Fri, 01 Dec 2023 15:22:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#66262] [PATCH v7 2/7] gnu: openfoam-org: Refactor dependency. Resent-From: reza Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 01 Dec 2023 20:22: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.17014621102138 (code B ref 66262); Fri, 01 Dec 2023 20:22:02 +0000 Received: (at 66262) by debbugs.gnu.org; 1 Dec 2023 20:21:50 +0000 Received: from localhost ([127.0.0.1]:56141 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9A1G-0000YP-Al for submit@debbugs.gnu.org; Fri, 01 Dec 2023 15:21:50 -0500 Received: from a2-43.smtp-out.eu-west-1.amazonses.com ([54.240.2.43]:57847) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <0102018c270b1b15-de00bec8-daed-437d-b7ae-43a527cf1bfe-000000@mail.housseini.me>) id 1r9A1E-0000Xx-L5 for 66262@debbugs.gnu.org; Fri, 01 Dec 2023 15:21:49 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=solmzk3ljecfoypi3q6x2mqs3bucnhjw; d=housseini.me; t=1701462088; h=Subject:From:To:Cc:Date:Mime-Version:Content-Type:Content-Transfer-Encoding:In-Reply-To:References:Message-Id; bh=smgF/ns83/rJMIepOTXS4xGB5qvL5qrAXmVg1VoO9bo=; b=RzQlLNrB9CaEs6DarDOqQ2qhexw1eKSSXn8eYgOO08TjZeoZE2uXU1G/eiKOG0Jl PIpzVLhpf82QjpqfO/06IS4nPqt5nKjJ0EZARIFl0ZF5U5wbY7UmOPrnuWnJ419QCXJ qiHEUk8m2HpuavyDQ8IFah7RAZcGNEcnL1j1LGsE= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=shh3fegwg5fppqsuzphvschd53n6ihuv; d=amazonses.com; t=1701462088; h=Subject:From:To:Cc:Date:Mime-Version:Content-Type:Content-Transfer-Encoding:In-Reply-To:References:Message-Id:Feedback-ID; bh=smgF/ns83/rJMIepOTXS4xGB5qvL5qrAXmVg1VoO9bo=; b=OAgfSEtBeyHKRL7N4ce+8mEoaGrJpK9IBYF7MebyIXACRQdiu7Dq7yg5a8x+MF5t MvIDxcEkPDmi10hxHzZpYFuNc6jirBm6TLEi8U4LRDjXwpt7zgYCChSI0NtLi+kio5o jguZxPlihNzOKWwgtnpp0HlSNM275T/7VJjxBhaM= Date: Fri, 1 Dec 2023 20:21:28 +0000 Mime-Version: 1.0 In-Reply-To: <5a90ca452eac7f8947a241bf0900ca928acc311f.1701462064.git.reza@housseini.me> References: <5a90ca452eac7f8947a241bf0900ca928acc311f.1701462064.git.reza@housseini.me> X-Mailer: Amazon WorkMail Thread-Index: AQHaJJPzxeoHSzDjRfGKH1PaN4MhNQAAAM+4 Thread-Topic: [PATCH v7 2/7] gnu: openfoam-org: Refactor dependency. X-Wm-Sent-Timestamp: 1701462087 X-Original-Mailer: git-send-email 2.41.0 Message-ID: <0102018c270b1b15-de00bec8-daed-437d-b7ae-43a527cf1bfe-000000@eu-west-1.amazonses.com> Feedback-ID: 1.eu-west-1.b24dn6frgCi6dh20skzbuMRr7UL8M6Soir/3ogtEjHQ=:AmazonSES X-SES-Outgoing: 2023.12.01-54.240.2.43 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): Move dependency paraview to from native-inputs to propagated-inputs. Change-Id: I64c53b3554acc3d7390c88bbf2bcbcac98cdc141 --- gnu/packages/simulation.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- 2.41.0 diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm index cb6f07c383..73e53fe35f 100644 --- a/gnu/packages/simulation.scm +++ b/gnu/packages/simulation.scm @@ -143,7 +143,6 @@ (define-public openfoam-org ncurses openmpi openssh - paraview pt-scotch32 readline zlib)) @@ -190,7 +189,7 @@ (define-public openfoam-org utfcpp vtk xz)) - (propagated-inputs (list gnuplot)) + (propagated-inputs (list paraview gnuplot)) (outputs '("debug" ;~60MB "out")) (arguments From patchwork Fri Dec 1 20:21:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: reza X-Patchwork-Id: 57181 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 A97F227BBE2; Fri, 1 Dec 2023 20:22:21 +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 1608D27BBED for ; Fri, 1 Dec 2023 20:22:16 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r9A1O-0004W8-6d; Fri, 01 Dec 2023 15:21:58 -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 1r9A1K-0004UN-Hn for guix-patches@gnu.org; Fri, 01 Dec 2023 15:21: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 1r9A1K-00059x-9R for guix-patches@gnu.org; Fri, 01 Dec 2023 15:21:54 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r9A1T-0000Zr-4e for guix-patches@gnu.org; Fri, 01 Dec 2023 15:22:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#66262] [PATCH v7 3/7] gnu: openfoam-org: Improve internal path handling. Resent-From: reza Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 01 Dec 2023 20:22:03 +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.17014621142156 (code B ref 66262); Fri, 01 Dec 2023 20:22:03 +0000 Received: (at 66262) by debbugs.gnu.org; 1 Dec 2023 20:21:54 +0000 Received: from localhost ([127.0.0.1]:56144 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9A1J-0000Yg-Kr for submit@debbugs.gnu.org; Fri, 01 Dec 2023 15:21:54 -0500 Received: from a6-238.smtp-out.eu-west-1.amazonses.com ([54.240.6.238]:48785) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <0102018c270b27c4-0d31f22d-4f5d-46d5-91a1-03cc727da837-000000@mail.housseini.me>) id 1r9A1H-0000Y7-W6 for 66262@debbugs.gnu.org; Fri, 01 Dec 2023 15:21:52 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=solmzk3ljecfoypi3q6x2mqs3bucnhjw; d=housseini.me; t=1701462091; h=Subject:From:To:Cc:Date:Mime-Version:Content-Type:Content-Transfer-Encoding:In-Reply-To:References:Message-Id; bh=m2AT8XjEcCsN4AmP6DQqzR6IdqVJFZiIFxK7MUBQi+s=; b=XunZB2N8SbJfFuxdhJI2wUdwX5zK4I6+Ls3HoGD/T6qJwtVrsTwWdJ35XHET5PDH hDuRtsWCOG2f80aiw/JOrskk2P0OrAVd+ppVCuKV+fUAAeht6bT8qpu9XloXqQX7KZ7 5npyxzka/WGYf45YfA2mYtIBitZt8ZvJCa+NjTvY= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=shh3fegwg5fppqsuzphvschd53n6ihuv; d=amazonses.com; t=1701462091; h=Subject:From:To:Cc:Date:Mime-Version:Content-Type:Content-Transfer-Encoding:In-Reply-To:References:Message-Id:Feedback-ID; bh=m2AT8XjEcCsN4AmP6DQqzR6IdqVJFZiIFxK7MUBQi+s=; b=hlFLHEU0cmhGiGAUlqkaW1fCeM6IgZJxus03mTbXPYUm7uS1xI3tiPBE/luXtBqs /OCTEiFe4IVjrFEAPiR62w2jN/4LckDgTYgm+lS58CQsKVYSOdnyOsKE0O4ZI3zWVU6 tY7YvaBquOqEknaAGQedu421+ukLr5er4ATP9Zp0= Date: Fri, 1 Dec 2023 20:21:31 +0000 Mime-Version: 1.0 In-Reply-To: <5a90ca452eac7f8947a241bf0900ca928acc311f.1701462064.git.reza@housseini.me> References: <5a90ca452eac7f8947a241bf0900ca928acc311f.1701462064.git.reza@housseini.me> X-Mailer: Amazon WorkMail Thread-Index: AQHaJJPzxeoHSzDjRfGKH1PaN4MhNQAAAUom Thread-Topic: [PATCH v7 3/7] gnu: openfoam-org: Improve internal path handling. X-Wm-Sent-Timestamp: 1701462090 X-Original-Mailer: git-send-email 2.41.0 Message-ID: <0102018c270b27c4-0d31f22d-4f5d-46d5-91a1-03cc727da837-000000@eu-west-1.amazonses.com> Feedback-ID: 1.eu-west-1.b24dn6frgCi6dh20skzbuMRr7UL8M6Soir/3ogtEjHQ=:AmazonSES X-SES-Outgoing: 2023.12.01-54.240.6.238 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 handling of internal path WM_PROJECT_DIR. Change-Id: I43de76fb009f955294686a0b45bf3dc0217e7dc7 --- gnu/packages/simulation.scm | 57 ++++++++++++++++++++++++++++--------- 1 file changed, 43 insertions(+), 14 deletions(-) -- 2.41.0 diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm index 73e53fe35f..75eb070f64 100644 --- a/gnu/packages/simulation.scm +++ b/gnu/packages/simulation.scm @@ -197,8 +197,10 @@ (define-public openfoam-org ;; Executable files and shared libraries are located in the 'platforms' ;; subdirectory. #:strip-directories - #~(list "share/OpenFOAM/platforms/linux64GccDPInt32Opt/bin" - "share/OpenFOAM/platforms/linux64GccDPInt32Opt/lib") + #~(list (string-append "OpenFOAM-" #$(package-version this-package) + "/platforms/linux64GccDPInt32Opt/bin") + (string-append "OpenFOAM-" #$(package-version this-package) + "/platforms/linux64GccDPInt32Opt/lib")) #:modules '((ice-9 ftw) @@ -278,7 +280,9 @@ (define-public openfoam-org "/lib,")) "" libraries)) (openfoam-lib (string-append #$output - "/share/OpenFOAM/platforms/linux64GccDPInt32Opt/lib")) + "/share/OpenFOAM-" + #$(package-version this-package) + "/platforms/linux64GccDPInt32Opt/lib")) (ldflags (string-append "-Wl," rpaths @@ -338,19 +342,32 @@ (define-public openfoam-org ;; (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-" + #$(package-version this-package)))) + (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 _ - (let ((install-dir (string-append #$output - "/share/OpenFOAM"))) - (mkdir-p install-dir) ;create install directory + (let ((install-path (string-append #$output + "/share/OpenFOAM-" + #$(package-version this-package)))) + (mkdir-p install-path) ;create install directory ;; move contents of build directory to install directory - (copy-recursively "." install-dir)))) + (copy-recursively "." install-path)))) (add-after 'install 'add-symbolic-link (lambda _ (let* ((bin (string-append #$output "/bin")) (lib (string-append #$output "/lib")) + (etc (string-append #$output "/etc")) (openfoam (string-append #$output - "/share/OpenFOAM")) + "/share/OpenFOAM-" + #$(package-version this-package))) (build-bin (string-append openfoam "/platforms/linux64GccDPInt32Opt/bin")) (build-lib (string-append openfoam @@ -373,12 +390,24 @@ (define-public openfoam-org (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"))))) + (symlink build-lib lib) + ;; add symbolic link for bashrc file + (mkdir-p etc) + (symlink (string-append openfoam "/etc/bashrc") + (string-append etc "/bashrc"))) #t)) + (add-after 'add-symbolic-link 'wrap + (lambda* (#:key python inputs outputs #:allow-other-keys) + (let* ((bin (string-append #$output "/bin")) + (openfoam (string-append #$output + "/share/OpenFOAM-" + #$(package-version this-package)))) + (for-each + (lambda (program) + (unless (member program + '("." "..")) + (wrap-program (string-append bin "/" program) + `("WM_PROJECT_DIR" ":" prefix (,openfoam))))) + (scandir bin)))))))) ;; Note: ;; Tutorial files are installed read-only in /gnu/store. ;; To allow write permissions on files copied from the store a From patchwork Fri Dec 1 20:21:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: reza X-Patchwork-Id: 57184 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 28D1727BBE9; Fri, 1 Dec 2023 20:22:35 +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 CFE3827BBE2 for ; Fri, 1 Dec 2023 20:22:33 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r9A1P-0004WK-4x; Fri, 01 Dec 2023 15:21:59 -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 1r9A1L-0004UX-2l for guix-patches@gnu.org; Fri, 01 Dec 2023 15:21: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 1r9A1K-0005A9-RB for guix-patches@gnu.org; Fri, 01 Dec 2023 15:21:54 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r9A1T-0000Zy-Lb for guix-patches@gnu.org; Fri, 01 Dec 2023 15:22:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#66262] [PATCH v7 4/7] gnu: openfoam-org: Improve build clean up. Resent-From: reza Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 01 Dec 2023 20:22:03 +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.17014621192177 (code B ref 66262); Fri, 01 Dec 2023 20:22:03 +0000 Received: (at 66262) by debbugs.gnu.org; 1 Dec 2023 20:21:59 +0000 Received: from localhost ([127.0.0.1]:56147 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9A1P-0000Z2-2z for submit@debbugs.gnu.org; Fri, 01 Dec 2023 15:21:59 -0500 Received: from a2-50.smtp-out.eu-west-1.amazonses.com ([54.240.2.50]:49879) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <0102018c270b3946-19d1f11f-bfe2-43d0-bb40-e9cb6d2a66e7-000000@mail.housseini.me>) id 1r9A1M-0000YX-Eb for 66262@debbugs.gnu.org; Fri, 01 Dec 2023 15:21:57 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=solmzk3ljecfoypi3q6x2mqs3bucnhjw; d=housseini.me; t=1701462096; h=Subject:From:To:Cc:Date:Mime-Version:Content-Type:Content-Transfer-Encoding:In-Reply-To:References:Message-Id; bh=h+36u6Gh6c1IvfFFXpjDTCLXufFhhLuYMpHxNyVFUbc=; b=NAC1gWinjUNZkY8lAW0RfswZlbwIIRYR2oOBYMNQYXh1ZlNWHY0ycgSKlXBdeqFK bWMIY8zMBLgenZoLNuEkrJX2AbiMwSldLlUIvVT5+YZWqlkrnTJBzsQba9G9+Pxg25n +sHjm2/aO6y2CvKUgC2lTDwIx9IItSiUAJZAuTe0= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=shh3fegwg5fppqsuzphvschd53n6ihuv; d=amazonses.com; t=1701462096; h=Subject:From:To:Cc:Date:Mime-Version:Content-Type:Content-Transfer-Encoding:In-Reply-To:References:Message-Id:Feedback-ID; bh=h+36u6Gh6c1IvfFFXpjDTCLXufFhhLuYMpHxNyVFUbc=; b=ZaMRo3hC1w/bcJqjU363lHVNmjPoCfhwoQ/AN4bb4csgDZhuLdIgr8Xu9QihazlJ qgTnvplNSIzfRnOnLUCWSI+ZQPawzBEFoVebKH9+LaLRCEko9XUS3tmUdWK0ZDQt/hf c75KXIhBxAJpKooo4cqQzZyct3KwLMtPZfLXSdv8= Date: Fri, 1 Dec 2023 20:21:36 +0000 Mime-Version: 1.0 In-Reply-To: <5a90ca452eac7f8947a241bf0900ca928acc311f.1701462064.git.reza@housseini.me> References: <5a90ca452eac7f8947a241bf0900ca928acc311f.1701462064.git.reza@housseini.me> <54b1a2d73885ed2f5fef4f74fde212f9c811ce66.1701462064.git.reza@housseini.me> X-Mailer: Amazon WorkMail Thread-Index: AQHaJJPzxeoHSzDjRfGKH1PaN4MhNQAAAfuv Thread-Topic: [PATCH v7 4/7] gnu: openfoam-org: Improve build clean up. X-Wm-Sent-Timestamp: 1701462095 X-Original-Mailer: git-send-email 2.41.0 Message-ID: <0102018c270b3946-19d1f11f-bfe2-43d0-bb40-e9cb6d2a66e7-000000@eu-west-1.amazonses.com> Feedback-ID: 1.eu-west-1.b24dn6frgCi6dh20skzbuMRr7UL8M6Soir/3ogtEjHQ=:AmazonSES X-SES-Outgoing: 2023.12.01-54.240.2.50 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(-) 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 Fri Dec 1 20:21:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: reza X-Patchwork-Id: 57179 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 2258827BBEE; Fri, 1 Dec 2023 20:22:18 +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 EE3EE27BBEB for ; Fri, 1 Dec 2023 20:22:15 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r9A1O-0004WA-7C; Fri, 01 Dec 2023 15:21:58 -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 1r9A1L-0004Uw-MW for guix-patches@gnu.org; Fri, 01 Dec 2023 15:21: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 1r9A1L-0005AJ-Dg for guix-patches@gnu.org; Fri, 01 Dec 2023 15:21:55 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r9A1U-0000aC-5l for guix-patches@gnu.org; Fri, 01 Dec 2023 15:22:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#66262] [PATCH v7 5/7] gnu: openfoam-org: Update to 11. Resent-From: reza Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 01 Dec 2023 20:22:04 +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.17014621202190 (code B ref 66262); Fri, 01 Dec 2023 20:22:04 +0000 Received: (at 66262) by debbugs.gnu.org; 1 Dec 2023 20:22:00 +0000 Received: from localhost ([127.0.0.1]:56150 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9A1Q-0000ZG-Es for submit@debbugs.gnu.org; Fri, 01 Dec 2023 15:22:00 -0500 Received: from a51-4.smtp-out.eu-west-1.amazonses.com ([54.240.51.4]:35431) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <0102018c270b44f0-5c315424-1285-443d-931b-09bbb36e243f-000000@mail.housseini.me>) id 1r9A1P-0000Yj-E4 for 66262@debbugs.gnu.org; Fri, 01 Dec 2023 15:22:00 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=solmzk3ljecfoypi3q6x2mqs3bucnhjw; d=housseini.me; t=1701462099; h=Subject:From:To:Cc:Date:Mime-Version:Content-Type:Content-Transfer-Encoding:In-Reply-To:References:Message-Id; bh=x7fmBkfwzPXA+i6BWQJBCgPA9eXMxZm8Mum8rRMwCZI=; b=eIDGxe3x5Jc5Ntv5KJoIpJofT/Dse8W29UWO+StMhKIe0dDV/HmLZxyRXWG16jLx GqqJmgrb1qc1SwBpujBE782Gh1wWhsL8HEuhKJahX7gZMvFu4JBKErKZbwTxLXyfLvo ZXIbFF92WuCFzd5DlmCuygyI0iFFQ8m4yd6Ghk/k= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=shh3fegwg5fppqsuzphvschd53n6ihuv; d=amazonses.com; t=1701462099; h=Subject:From:To:Cc:Date:Mime-Version:Content-Type:Content-Transfer-Encoding:In-Reply-To:References:Message-Id:Feedback-ID; bh=x7fmBkfwzPXA+i6BWQJBCgPA9eXMxZm8Mum8rRMwCZI=; b=vus87PlAEVc0qoFYBWxflKW/PVU6C7XLegMHKHRoZR9yG/dfRdHf6+xqpSF0iymZ /WS8Lc+uyG9zMu3ITUnm8kdI+602j+vTRD/zKnnQpMEXLZtczZSoYgjLbzD1rhU3Bod siTsXLqERG6KvpDYEF2SbJ+2XOXMgKL38SF9Wu9M= Date: Fri, 1 Dec 2023 20:21:39 +0000 Mime-Version: 1.0 In-Reply-To: <5a90ca452eac7f8947a241bf0900ca928acc311f.1701462064.git.reza@housseini.me> References: <5a90ca452eac7f8947a241bf0900ca928acc311f.1701462064.git.reza@housseini.me> X-Mailer: Amazon WorkMail Thread-Index: AQHaJJPzxeoHSzDjRfGKH1PaN4MhNQAAAmYs Thread-Topic: [PATCH v7 5/7] gnu: openfoam-org: Update to 11. X-Wm-Sent-Timestamp: 1701462098 X-Original-Mailer: git-send-email 2.41.0 Message-ID: <0102018c270b44f0-5c315424-1285-443d-931b-09bbb36e243f-000000@eu-west-1.amazonses.com> Feedback-ID: 1.eu-west-1.b24dn6frgCi6dh20skzbuMRr7UL8M6Soir/3ogtEjHQ=:AmazonSES X-SES-Outgoing: 2023.12.01-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.scm (openfoam-org): Update to 11. Change-Id: I6f9752e8bb35754ac3f67acbaa1e4ae8b216e410 --- gnu/packages/simulation.scm | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) -- 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 Fri Dec 1 20:21:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: reza X-Patchwork-Id: 57183 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 C1C1027BBE9; Fri, 1 Dec 2023 20:22:29 +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 C909627BBE2 for ; Fri, 1 Dec 2023 20:22:27 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r9A1P-0004XD-HN; Fri, 01 Dec 2023 15:21:59 -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 1r9A1M-0004VN-Vh for guix-patches@gnu.org; Fri, 01 Dec 2023 15:21: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 1r9A1L-0005AR-Rg for guix-patches@gnu.org; Fri, 01 Dec 2023 15:21:56 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r9A1U-0000aK-N4 for guix-patches@gnu.org; Fri, 01 Dec 2023 15:22:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#66262] [PATCH v7 6/7] gnu: openfoam-com: Update to 2306. Resent-From: reza Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 01 Dec 2023 20:22:04 +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.17014621242242 (code B ref 66262); Fri, 01 Dec 2023 20:22:04 +0000 Received: (at 66262) by debbugs.gnu.org; 1 Dec 2023 20:22:04 +0000 Received: from localhost ([127.0.0.1]:56157 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9A1T-0000a4-PT for submit@debbugs.gnu.org; Fri, 01 Dec 2023 15:22:04 -0500 Received: from a2-8.smtp-out.eu-west-1.amazonses.com ([54.240.2.8]:48559) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <0102018c270b4f69-b1d41878-9e0b-46cd-aa36-ace133023b56-000000@mail.housseini.me>) id 1r9A1S-0000Yu-1k for 66262@debbugs.gnu.org; Fri, 01 Dec 2023 15:22:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=solmzk3ljecfoypi3q6x2mqs3bucnhjw; d=housseini.me; t=1701462102; h=Subject:From:To:Cc:Date:Mime-Version:Content-Type:Content-Transfer-Encoding:In-Reply-To:References:Message-Id; bh=4wzD5LdYEtza1F9dfwL6u6sviT4adaz0jij61ESa/t0=; b=VzPhA7LSpLRG9JPqVBfi1VX/OLWtd9o6GXRGUIkVc9i0MBecjy7WidOsXRM7wqM7 7JmoR4b4zLiIWT5rqkyYw+NR++2zNGE5MSrtmm6pMMtJ7GNGEz+UTxA+aHujYlD2kSK 6ps6YNGkO7ryhvdgrff9ivDq2CmJh/oOjkxkoO2E= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=shh3fegwg5fppqsuzphvschd53n6ihuv; d=amazonses.com; t=1701462102; h=Subject:From:To:Cc:Date:Mime-Version:Content-Type:Content-Transfer-Encoding:In-Reply-To:References:Message-Id:Feedback-ID; bh=4wzD5LdYEtza1F9dfwL6u6sviT4adaz0jij61ESa/t0=; b=YlJkkDuYi/UgJvvPE8DfRgWGlXLign6iVS08AywDEot75MrOx/57/bu1v6jj2W1Z og+q4aQzNAXDfTPIxWW8igfl/ne5z9yoXsOmAF0BebZX65ckPCe06YDxEwDOWvc08Pw 36y5DsUIjJPbTfokndSS9IQM+tPR7zlKHwktVV9o= Date: Fri, 1 Dec 2023 20:21:41 +0000 Mime-Version: 1.0 In-Reply-To: <5a90ca452eac7f8947a241bf0900ca928acc311f.1701462064.git.reza@housseini.me> References: <5a90ca452eac7f8947a241bf0900ca928acc311f.1701462064.git.reza@housseini.me> <1e5198861de5777cb1ad76b7919bc80870b54585.1701462064.git.reza@housseini.me> X-Mailer: Amazon WorkMail Thread-Index: AQHaJJPzxeoHSzDjRfGKH1PaN4MhNQAAAtKP Thread-Topic: [PATCH v7 6/7] gnu: openfoam-com: Update to 2306. X-Wm-Sent-Timestamp: 1701462101 X-Original-Mailer: git-send-email 2.41.0 Message-ID: <0102018c270b4f69-b1d41878-9e0b-46cd-aa36-ace133023b56-000000@eu-west-1.amazonses.com> Feedback-ID: 1.eu-west-1.b24dn6frgCi6dh20skzbuMRr7UL8M6Soir/3ogtEjHQ=:AmazonSES X-SES-Outgoing: 2023.12.01-54.240.2.8 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(-) 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" From patchwork Fri Dec 1 20:21:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: reza X-Patchwork-Id: 57185 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 2391A27BBE9; Fri, 1 Dec 2023 20:23:21 +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 0013327BBE2 for ; Fri, 1 Dec 2023 20:23:17 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r9A2M-00051G-5D; Fri, 01 Dec 2023 15:22:58 -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 1r9A2H-0004zM-Pw for guix-patches@gnu.org; Fri, 01 Dec 2023 15:22:53 -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 1r9A2H-0005JW-I6 for guix-patches@gnu.org; Fri, 01 Dec 2023 15:22:53 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r9A2Q-0000by-3m for guix-patches@gnu.org; Fri, 01 Dec 2023 15:23:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#66262] [PATCH v7 7/7] gnu: openfoam-org: Improve wrapping of binaries. Resent-From: reza Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 01 Dec 2023 20:23: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.17014621282282 (code B ref 66262); Fri, 01 Dec 2023 20:23:02 +0000 Received: (at 66262) by debbugs.gnu.org; 1 Dec 2023 20:22:08 +0000 Received: from localhost ([127.0.0.1]:56162 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9A1Y-0000aj-4B for submit@debbugs.gnu.org; Fri, 01 Dec 2023 15:22:08 -0500 Received: from a2-134.smtp-out.eu-west-1.amazonses.com ([54.240.2.134]:59169) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <0102018c270b602e-42d16a77-013b-4cca-ac8d-cc731d174e67-000000@mail.housseini.me>) id 1r9A1W-0000ZN-DO for 66262@debbugs.gnu.org; Fri, 01 Dec 2023 15:22:07 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=solmzk3ljecfoypi3q6x2mqs3bucnhjw; d=housseini.me; t=1701462106; h=Subject:From:To:Cc:Date:Mime-Version:Content-Type:Content-Transfer-Encoding:In-Reply-To:References:Message-Id; bh=H6TF7FPnOeAZJssF5z+ScDO97VXouVgNqBPGjMS+Hcw=; b=DPU5DbvOEG7yBK9nRqIyoGYRJznZ0aqN+Y9XZZ6EtCIxOm1H3iIPvS5a7gQUztzl rvl9sDDa9HSwchzXbYWsS73RNOWHJW87bkndxaVNFqX9CDtYtNrf9Tb2U21JM57K2+t 5+6Hmc0/nu+PNQAy8HdbfmLHsmYqNe6YLvfEZgZo= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=shh3fegwg5fppqsuzphvschd53n6ihuv; d=amazonses.com; t=1701462106; h=Subject:From:To:Cc:Date:Mime-Version:Content-Type:Content-Transfer-Encoding:In-Reply-To:References:Message-Id:Feedback-ID; bh=H6TF7FPnOeAZJssF5z+ScDO97VXouVgNqBPGjMS+Hcw=; b=dlhaw6BGWkDmn8LX1sdk4ac7chfOFNzD4CUv3EaX3Dpjp2ptvUmmUVbai4KNX9uO a0LH6KMliPnXTlAv+QFmNZqgHaeJwGy7n2FYoa2iNyh/dD7ifAp3csnep2bD/zE/8Iq xL9mp/0jOW4oBPlA1ykVH1tA64UPG+QMY8cd61Ys= Date: Fri, 1 Dec 2023 20:21:46 +0000 Mime-Version: 1.0 In-Reply-To: <5a90ca452eac7f8947a241bf0900ca928acc311f.1701462064.git.reza@housseini.me> References: <5a90ca452eac7f8947a241bf0900ca928acc311f.1701462064.git.reza@housseini.me> X-Mailer: Amazon WorkMail Thread-Index: AQHaJJPzxeoHSzDjRfGKH1PaN4MhNQAAA3Xp Thread-Topic: [PATCH v7 7/7] gnu: openfoam-org: Improve wrapping of binaries. X-Wm-Sent-Timestamp: 1701462105 X-Original-Mailer: git-send-email 2.41.0 Message-ID: <0102018c270b602e-42d16a77-013b-4cca-ac8d-cc731d174e67-000000@eu-west-1.amazonses.com> Feedback-ID: 1.eu-west-1.b24dn6frgCi6dh20skzbuMRr7UL8M6Soir/3ogtEjHQ=:AmazonSES X-SES-Outgoing: 2023.12.01-54.240.2.134 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): Add all variables from etc/bashrc to the wrapping of binaries. Change-Id: Idf0d4d9a043dfff806b6fb1871c1931794c1935b --- gnu/packages/simulation.scm | 159 +++++++++++++++++++++++++++++++++++- 1 file changed, 155 insertions(+), 4 deletions(-) -- 2.41.0 diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm index f01044e76a..6b61783c2c 100644 --- a/gnu/packages/simulation.scm +++ b/gnu/packages/simulation.scm @@ -401,15 +401,166 @@ (define-public openfoam-org (add-after 'add-symbolic-link 'wrap (lambda* (#:key python inputs outputs #:allow-other-keys) (let* ((bin (string-append #$output "/bin")) - (openfoam (string-append #$output - "/share/OpenFOAM-" - #$(package-version this-package)))) + (openfoam-version #$(package-version this-package)) + (openfoam-root (string-append #$output + "/share/OpenFOAM-" + openfoam-version)) + (openmpi-version #$(package-version openmpi)) + (paraview-version #$(package-version paraview)) + (paraview-version-major+minor + #$(version-major+minor (package-version paraview)))) (for-each (lambda (program) (unless (member program '("." "..")) + ;; wrap the programs with all the variables created by sourcing + ;; etc/bashrc (wrap-program (string-append bin "/" program) - `("WM_PROJECT_DIR" ":" prefix (,openfoam))))) + `("WM_PROJECT_INST_DIR" = (,openfoam-root)) + `("WM_PROJECT_DIR" = (,openfoam-root)) + '("WM_PROJECT" = ("OpenFOAM")) + `("WM_PROJECT_VERSION" = (,openfoam-version)) + '("WM_COMPILER_TYPE" = ("system")) + '("WM_COMPILER" = ("Gcc")) + '("WM_ARCH_OPTION" = ("64")) + '("WM_PRECISION_OPTION" = ("DP")) + '("WM_LABEL_SIZE" = ("32")) + '("WM_COMPILE_OPTION" = ("Opt")) + '("WM_MPLIB" = ("OPENMPI")) + '("WM_OSTYPE" = ("POSIX")) + '("WM_OPTIONS" = ("linux64GccDPInt32Opt")) + `("WM_PROJECT_USER_DIR" = (,(string-append + "$HOME/OpenFOAM/$USER-" + openfoam-version))) + `("WM_THIRD_PARTY_DIR" = (,(string-append + openfoam-root + "/ThirdParty-" + openfoam-version))) + '("WM_LABEL_OPTION" = ("Int32")) + '("WM_LINK_LANGUAGE" = ("c++")) + '("WM_COMPILER_LIB_ARCH" = ("64")) + `("WM_DIR" = (,(string-append openfoam-root "/wmake"))) + '("WM_LDFLAGS" = ("-m64")) + '("WM_CC" = ("gcc")) + '("WM_CFLAGS" = ("-m64 -fPIC")) + '("WM_CXX" = ("g++")) + '("WM_CXXFLAGS" = ("-m64 -fPIC -std=c++0x")) + + `("FOAM_INST_DIR" = (,openfoam-root)) + `("FOAM_APP" = (,(string-append openfoam-root + "/applications"))) + `("FOAM_SRC" = (,(string-append openfoam-root "/src"))) + `("FOAM_ETC" = (,(string-append openfoam-root "/etc"))) + `("FOAM_TUTORIALS" = (,(string-append openfoam-root + "/tutorials"))) + `("FOAM_UTILITIES" = (,(string-append + openfoam-root + "/applications/utilities"))) + `("FOAM_SOLVERS" = (,(string-append + openfoam-root + "/applications/solvers"))) + `("FOAM_MPI" = (,(string-append "openmpi-" + openmpi-version))) + `("FOAM_RUN" = (,(string-append "$HOME/OpenFOAM/$USER-" + openfoam-version "/run"))) + `("FOAM_EXT_LIBBIN" = (,(string-append + openfoam-root + "/ThirdParty-" + openfoam-version + "/platforms/linux64GccDPInt32/lib"))) + `("FOAM_APPBIN" = (,(string-append + openfoam-root + "/platforms/linux64GccDPInt32Opt/bin"))) + `("FOAM_JOB_DIR" = (,(string-append openfoam-root + "/jobControl"))) + `("FOAM_LIBBIN" = (,(string-append + openfoam-root + "/platforms/linux64GccDPInt32Opt/lib"))) + `("FOAM_SITE_LIBBIN" = (,(string-append + openfoam-root + "/site/" + openfoam-version + "/platforms/linux64GccDPInt32Opt/lib"))) + `("FOAM_SITE_APPBIN" = (,(string-append + openfoam-root + "/site/" + openfoam-version + "/platforms/linux64GccDPInt32Opt/bin"))) + `("FOAM_USER_LIBBIN" = (,(string-append + "$HOME/OpenFOAM/$USER-" + openfoam-version + "/platforms/linux64GccDPInt32Opt/lib"))) + `("FOAM_USER_APPBIN" = (,(string-append + "$HOME/OpenFOAM/$USER-" + openfoam-version + "/platforms/linux64GccDPInt32Opt/bin"))) + `("FOAM_MODULES" = (,(string-append openfoam-root + "/applications/modules"))) + '("FOAM_SIGFPE" = ("")) + '("FOAM_SETTINGS" = ("")) + + `("ParaView_INCLUDE_DIR" = (,(string-append #$paraview + "/include/paraview-" + paraview-version-major+minor))) + '("ParaView_GL" = ("mesa")) + `("ParaView_VERSION" = (,paraview-version)) + `("ParaView_MAJOR" = (,paraview-version-major+minor)) + `("ParaView_DIR" = (,#$paraview)) + `("PV_PLUGIN_PATH" = (,(string-append + openfoam-root + "/platforms/linux64GccDPInt32Opt/lib/paraview-" + paraview-version-major+minor))) + + `("MPI_ARCH_PATH" = (,#$openmpi)) + `("OPAL_PREFIX" = (,#$openmpi)) + '("MPI_BUFFER_SIZE" = ("20000000")) + + `("LD_LIBRARY_PATH" prefix + (,(string-append openfoam-root "/ThirdParty-" + openfoam-version + "/platforms/linux64Gcc/gperftools-svn/lib") + ,(string-append #$paraview "/lib") + ,(string-append openfoam-root + "/platforms/linux64GccDPInt32Opt/lib/openmpi-" + openmpi-version) + ,(string-append openfoam-root "/ThirdParty-" + openfoam-version + "/platforms/linux64GccDPInt32/lib/openmpi-" + openmpi-version) + ,(string-append #$openmpi "/lib") + ,(string-append #$openmpi "/lib64") + ,(string-append "$HOME/OpenFOAM/$USER-" + openfoam-version + "/platforms/linux64GccDPInt32Opt/lib") + ,(string-append openfoam-root "/site/" + openfoam-version + "/platforms/linux64GccDPInt32Opt/lib") + ,(string-append openfoam-root + "/platforms/linux64GccDPInt32Opt/lib") + ,(string-append openfoam-root "/ThirdParty-" + openfoam-version + "/platforms/linux64GccDPInt32/lib") + ,(string-append openfoam-root + "/platforms/linux64GccDPInt32Opt/lib/dummy"))) + `("PATH" prefix + (,(string-append openfoam-root "/ThirdParty-" + openfoam-version + "/platforms/linux64Gcc/gperftools-svn/bin") + ,(string-append #$paraview "/bin") + ,(string-append openfoam-root "/ThirdParty-" + openfoam-version + "/platforms/linux64Gcc/cmake-*/bin") + ,(string-append #$openmpi "/bin") + ,(string-append openfoam-root "/bin") + ,(string-append openfoam-root "/wmake") + ,(string-append "$HOME/OpenFOAM/$USER-" + openfoam-version + "/platforms/linux64GccDPInt32Opt/bin") + ,(string-append openfoam-root "/site/" + openfoam-version + "/platforms/linux64GccDPInt32Opt/bin") + ,(string-append openfoam-root + "/platforms/linux64GccDPInt32Opt/bin")))))) (scandir bin)))))))) ;; Note: ;; Tutorial files are installed read-only in /gnu/store.