From patchwork Wed Nov 29 14:29:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: reza X-Patchwork-Id: 57038 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 C5ADC27BBEA; Wed, 29 Nov 2023 14:30:36 +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 2349727BBE9 for ; Wed, 29 Nov 2023 14:30:36 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r8LZd-0007Ms-NH; Wed, 29 Nov 2023 09:29: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 1r8LZc-0007M9-4C for guix-patches@gnu.org; Wed, 29 Nov 2023 09:29:56 -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 1r8LZb-00020H-QV for guix-patches@gnu.org; Wed, 29 Nov 2023 09:29:55 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r8LZj-0002dE-A3 for guix-patches@gnu.org; Wed, 29 Nov 2023 09:30:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#66262] [PATCH v4 2/6] gnu: openfoam-org: Refactor dependency. Resent-From: reza Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 29 Nov 2023 14:30: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.17012681669984 (code B ref 66262); Wed, 29 Nov 2023 14:30:03 +0000 Received: (at 66262) by debbugs.gnu.org; 29 Nov 2023 14:29:26 +0000 Received: from localhost ([127.0.0.1]:49222 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r8LZ8-0002ax-81 for submit@debbugs.gnu.org; Wed, 29 Nov 2023 09:29:26 -0500 Received: from a2-134.smtp-out.eu-west-1.amazonses.com ([54.240.2.134]:34915) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <0102018c1b7bc2b3-8b054767-1be2-4c35-a92f-eb0cce13e97d-000000@mail.housseini.me>) id 1r8LZ5-0002ah-PZ for 66262@debbugs.gnu.org; Wed, 29 Nov 2023 09:29:24 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=solmzk3ljecfoypi3q6x2mqs3bucnhjw; d=housseini.me; t=1701268144; h=Subject:From:To:Cc:Date:Mime-Version:Content-Type:Content-Transfer-Encoding:In-Reply-To:References:Message-Id; bh=smgF/ns83/rJMIepOTXS4xGB5qvL5qrAXmVg1VoO9bo=; b=IfsGEJdBK0QTmB8l56lljYnm4i1uqaLQEubtHJTCPT1Y0BuFHBzW7wfB5S21pz7t pidbmVy1xyqMH7yoA+G1EyimiFxI5i69K9OQe0GXqWmytJ4eu26QB0TxRvNisJ9/0PZ iNutcacOtwJVGx43GC1CpqJLuS4sznSKiwArzW90= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=shh3fegwg5fppqsuzphvschd53n6ihuv; d=amazonses.com; t=1701268144; 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=i03nq456JRv42RyD1/6YtQXBOyOZbWjXD71MZB/ojhZBOEL91CR/yLtpEqGkUzbV RxOC5GCbxx+GgofizdYFtHC/ZkJ+HcwJoYJ5zeCsUdDotYzdqanCdUz//6G1TI46wR0 y1SX+Jkp+ht200/viFC1cerPBCmBjvK59slX8b/4= Date: Wed, 29 Nov 2023 14:29:04 +0000 Mime-Version: 1.0 In-Reply-To: References: X-Mailer: Amazon WorkMail Thread-Index: AQHaItBgpBQ4R4lqRQW/cxQVMxxTZAAAAap/ Thread-Topic: [PATCH v4 2/6] gnu: openfoam-org: Refactor dependency. X-Wm-Sent-Timestamp: 1701268143 X-Original-Mailer: git-send-email 2.41.0 Message-ID: <0102018c1b7bc2b3-8b054767-1be2-4c35-a92f-eb0cce13e97d-000000@eu-west-1.amazonses.com> Feedback-ID: 1.eu-west-1.b24dn6frgCi6dh20skzbuMRr7UL8M6Soir/3ogtEjHQ=:AmazonSES X-SES-Outgoing: 2023.11.29-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): 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 Wed Nov 29 14:29:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: reza X-Patchwork-Id: 57042 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 1734F27BBE9; Wed, 29 Nov 2023 14:30:53 +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 CD55D27BBED for ; Wed, 29 Nov 2023 14:30:49 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r8LZf-0007Np-Fz; Wed, 29 Nov 2023 09:29: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 1r8LZc-0007MN-JL for guix-patches@gnu.org; Wed, 29 Nov 2023 09:29:56 -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 1r8LZc-00020R-BD for guix-patches@gnu.org; Wed, 29 Nov 2023 09:29:56 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r8LZj-0002dM-Rt for guix-patches@gnu.org; Wed, 29 Nov 2023 09:30:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#66262] [PATCH v4 3/6] gnu: openfoam-org: Improve internal path handling. Resent-From: reza Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 29 Nov 2023 14:30: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.170126817110004 (code B ref 66262); Wed, 29 Nov 2023 14:30:03 +0000 Received: (at 66262) by debbugs.gnu.org; 29 Nov 2023 14:29:31 +0000 Received: from localhost ([127.0.0.1]:49225 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r8LZC-0002bG-Hy for submit@debbugs.gnu.org; Wed, 29 Nov 2023 09:29:31 -0500 Received: from a2-86.smtp-out.eu-west-1.amazonses.com ([54.240.2.86]:52407) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <0102018c1b7bd644-e5d6a960-b3c2-48aa-9822-a7b6188ea8c4-000000@mail.housseini.me>) id 1r8LZA-0002ao-M1 for 66262@debbugs.gnu.org; Wed, 29 Nov 2023 09:29:29 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=solmzk3ljecfoypi3q6x2mqs3bucnhjw; d=housseini.me; t=1701268149; h=Subject:From:To:Cc:Date:Mime-Version:Content-Type:Content-Transfer-Encoding:In-Reply-To:References:Message-Id; bh=m2AT8XjEcCsN4AmP6DQqzR6IdqVJFZiIFxK7MUBQi+s=; b=Ypd+ncGC+Q2/q6dyZzIJoscYIr3k0YHQLq4uBZDaNfWGKJhH2yEwXc84yyIzNOnI +viBOxITXXPCMnOiHdxPaW2wjz68ebZr3kpIKd+TqDMpE+JP6uWnjD+ESgu9yRdrplK Lw91aI2O4yo9jts6b5Zya9vciKNtU9xEr5J5Rysw= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=shh3fegwg5fppqsuzphvschd53n6ihuv; d=amazonses.com; t=1701268149; 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=utdAFjonW2ZensPB6ZIhYAx8iDdhaFScjM4zYYUHOKNFyyqtc8hAfJVZCQehmenH Ie1j81oDmFcuK+1ZuICf2ipSORWzWf+dcQcp8kUVga8AIfG1sDvrJBYbMi3rjXggwai 6GPnAwZZahvjfWPCclBym780TxM8i39K8WUp/LtQ= Date: Wed, 29 Nov 2023 14:29:09 +0000 Mime-Version: 1.0 In-Reply-To: References: <0acf762696be31d70a2c40523c0054e52f9606ef.1701268112.git.reza@housseini.me> X-Mailer: Amazon WorkMail Thread-Index: AQHaItBgpBQ4R4lqRQW/cxQVMxxTZAAAAnbI Thread-Topic: [PATCH v4 3/6] gnu: openfoam-org: Improve internal path handling. X-Wm-Sent-Timestamp: 1701268149 X-Original-Mailer: git-send-email 2.41.0 Message-ID: <0102018c1b7bd644-e5d6a960-b3c2-48aa-9822-a7b6188ea8c4-000000@eu-west-1.amazonses.com> Feedback-ID: 1.eu-west-1.b24dn6frgCi6dh20skzbuMRr7UL8M6Soir/3ogtEjHQ=:AmazonSES X-SES-Outgoing: 2023.11.29-54.240.2.86 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 Wed Nov 29 14:29:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: reza X-Patchwork-Id: 57041 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 B291E27BBEE; Wed, 29 Nov 2023 14:30:50 +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 E55EF27BBE2 for ; Wed, 29 Nov 2023 14:30:46 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r8LZf-0007Ns-G5; Wed, 29 Nov 2023 09:29: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 1r8LZd-0007Mv-Ri for guix-patches@gnu.org; Wed, 29 Nov 2023 09:29: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 1r8LZd-00020i-JP for guix-patches@gnu.org; Wed, 29 Nov 2023 09:29:57 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r8LZl-0002dc-2u for guix-patches@gnu.org; Wed, 29 Nov 2023 09:30:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#66262] [PATCH v4 4/6] gnu: openfoam-org: Improve build clean up. Resent-From: reza Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 29 Nov 2023 14:30:05 +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.170126817710037 (code B ref 66262); Wed, 29 Nov 2023 14:30:05 +0000 Received: (at 66262) by debbugs.gnu.org; 29 Nov 2023 14:29:37 +0000 Received: from localhost ([127.0.0.1]:49231 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r8LZI-0002bj-JT for submit@debbugs.gnu.org; Wed, 29 Nov 2023 09:29:36 -0500 Received: from a2-249.smtp-out.eu-west-1.amazonses.com ([54.240.2.249]:33375) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <0102018c1b7bed2d-635d8749-047e-4f80-9b20-6ad52e4d9eea-000000@mail.housseini.me>) id 1r8LZG-0002b8-K6 for 66262@debbugs.gnu.org; Wed, 29 Nov 2023 09:29:35 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=solmzk3ljecfoypi3q6x2mqs3bucnhjw; d=housseini.me; t=1701268155; h=Subject:From:To:Cc:Date:Mime-Version:Content-Type:Content-Transfer-Encoding:In-Reply-To:References:Message-Id; bh=h+36u6Gh6c1IvfFFXpjDTCLXufFhhLuYMpHxNyVFUbc=; b=l/cSbPS8KpPm9FjXkel5siyTzdfTThfc8MawckG/KJcpEWydj7mcfbAZ8gPwko2i aUK0ImsMHqKZuJHrYAqYfAtl8bsNEm/jlC08N43/phcWfNFCWf6x5BIwCu3uIloYavZ RXjfU2WD2Sinb85G4CoxrvRh/wVKDBJdctywDAy0= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=shh3fegwg5fppqsuzphvschd53n6ihuv; d=amazonses.com; t=1701268155; 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=nvfExKCLIHdntg/8c0Aj7W6ogWur74Gkr884KaBw4aY6ZPAzcS/zOPhxOBO3yx48 CBJDmddgt1SJuS1DtuNpohXYZ++KQTrBzPEzgF1529nZqIL31h67FHa8cZMSxNmSV34 UJGSKRoXMjJLkHOaGFphnU/KR2rkosmHavyblL7o= Date: Wed, 29 Nov 2023 14:29:15 +0000 Mime-Version: 1.0 In-Reply-To: References: <97b7044beb51357a1b2f50bc59ab840fa5f97808.1701268112.git.reza@housseini.me> X-Mailer: Amazon WorkMail Thread-Index: AQHaItBgpBQ4R4lqRQW/cxQVMxxTZAAAA1hd Thread-Topic: [PATCH v4 4/6] gnu: openfoam-org: Improve build clean up. X-Wm-Sent-Timestamp: 1701268154 X-Original-Mailer: git-send-email 2.41.0 Message-ID: <0102018c1b7bed2d-635d8749-047e-4f80-9b20-6ad52e4d9eea-000000@eu-west-1.amazonses.com> Feedback-ID: 1.eu-west-1.b24dn6frgCi6dh20skzbuMRr7UL8M6Soir/3ogtEjHQ=:AmazonSES X-SES-Outgoing: 2023.11.29-54.240.2.249 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 Wed Nov 29 14:29:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: reza X-Patchwork-Id: 57040 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 D670B27BBEB; Wed, 29 Nov 2023 14:30:38 +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 8393A27BBE9 for ; Wed, 29 Nov 2023 14:30:38 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r8LZh-0007OS-B1; Wed, 29 Nov 2023 09:30:01 -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 1r8LZe-0007N2-84 for guix-patches@gnu.org; Wed, 29 Nov 2023 09:29:58 -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 1r8LZd-00020o-VO for guix-patches@gnu.org; Wed, 29 Nov 2023 09:29:57 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r8LZl-0002dj-FB for guix-patches@gnu.org; Wed, 29 Nov 2023 09:30:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#66262] [PATCH v4 5/6] gnu: openfoam-org: Update to 11. Resent-From: reza Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 29 Nov 2023 14:30:05 +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.170126818410056 (code B ref 66262); Wed, 29 Nov 2023 14:30:05 +0000 Received: (at 66262) by debbugs.gnu.org; 29 Nov 2023 14:29:44 +0000 Received: from localhost ([127.0.0.1]:49234 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r8LZQ-0002c7-0a for submit@debbugs.gnu.org; Wed, 29 Nov 2023 09:29:44 -0500 Received: from a2-121.smtp-out.eu-west-1.amazonses.com ([54.240.2.121]:46829) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <0102018c1b7bfef1-05ec3c68-24bb-43c0-9ef1-17ec3a472f76-000000@mail.housseini.me>) id 1r8LZL-0002bU-3g for 66262@debbugs.gnu.org; Wed, 29 Nov 2023 09:29:39 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=solmzk3ljecfoypi3q6x2mqs3bucnhjw; d=housseini.me; t=1701268160; h=Subject:From:To:Cc:Date:Mime-Version:Content-Type:Content-Transfer-Encoding:In-Reply-To:References:Message-Id; bh=x7fmBkfwzPXA+i6BWQJBCgPA9eXMxZm8Mum8rRMwCZI=; b=UjDb3HVgINWb2ig7W042ExhnTUplPxV0YPfvVSIeagCw7xaEr2P5FZ0M47WLTs7u kNK+l/Tu9x2B719+GMGUY4CI55+sSoT9iKAlnBxh2DpziBX+WBztBUtH7gJSa3uguuo cP98iUU/Gyi4gUoDr7h0ngyrKdpju5c8V6pDZncg= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=shh3fegwg5fppqsuzphvschd53n6ihuv; d=amazonses.com; t=1701268160; 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=sLdSU/IfgvW/uYA/Q0iN1UoSTacZLO5RFT10aojHZp6LbjfJSUA9u9Pcuk0qb2iV vhTlWLzudyrD0NIvpTb7Ftue0L6iV9Niz2OYv1U7Eu9ZPpMVsLtmYg1i2QB3OMoI6Gu VSiOZ44z0blOP553hJovXmYfziQ2RW3jRUsygFYk= Date: Wed, 29 Nov 2023 14:29:20 +0000 Mime-Version: 1.0 In-Reply-To: References: <5380542281402a0572fbb4270658f354611448d9.1701268112.git.reza@housseini.me> X-Mailer: Amazon WorkMail Thread-Index: AQHaItBgpBQ4R4lqRQW/cxQVMxxTZAAAA/cZ Thread-Topic: [PATCH v4 5/6] gnu: openfoam-org: Update to 11. X-Wm-Sent-Timestamp: 1701268159 X-Original-Mailer: git-send-email 2.41.0 Message-ID: <0102018c1b7bfef1-05ec3c68-24bb-43c0-9ef1-17ec3a472f76-000000@eu-west-1.amazonses.com> Feedback-ID: 1.eu-west-1.b24dn6frgCi6dh20skzbuMRr7UL8M6Soir/3ogtEjHQ=:AmazonSES X-SES-Outgoing: 2023.11.29-54.240.2.121 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 Wed Nov 29 14:29:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: reza X-Patchwork-Id: 57039 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 D5D6A27BBEB; Wed, 29 Nov 2023 14:30:37 +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 788B027BBE9 for ; Wed, 29 Nov 2023 14:30:37 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r8LZf-0007OL-VL; Wed, 29 Nov 2023 09:29: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 1r8LZd-0007MZ-4v for guix-patches@gnu.org; Wed, 29 Nov 2023 09:29: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 1r8LZc-00020Z-T1 for guix-patches@gnu.org; Wed, 29 Nov 2023 09:29:56 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r8LZk-0002dT-Cg for guix-patches@gnu.org; Wed, 29 Nov 2023 09:30:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#66262] [PATCH v4 6/6] gnu: openfoam-com: Update to 2306. Resent-From: reza Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 29 Nov 2023 14:30: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.170126817610031 (code B ref 66262); Wed, 29 Nov 2023 14:30:04 +0000 Received: (at 66262) by debbugs.gnu.org; 29 Nov 2023 14:29:36 +0000 Received: from localhost ([127.0.0.1]:49229 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r8LZI-0002bh-3Z for submit@debbugs.gnu.org; Wed, 29 Nov 2023 09:29:36 -0500 Received: from a2-134.smtp-out.eu-west-1.amazonses.com ([54.240.2.134]:34915) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <0102018c1b7c1445-1ace1095-2585-4777-b163-26f247d87f01-000000@mail.housseini.me>) id 1r8LZG-0002ah-0F for 66262@debbugs.gnu.org; Wed, 29 Nov 2023 09:29:34 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=solmzk3ljecfoypi3q6x2mqs3bucnhjw; d=housseini.me; t=1701268165; h=Subject:From:To:Cc:Date:Mime-Version:Content-Type:Content-Transfer-Encoding:In-Reply-To:References:Message-Id; bh=4wzD5LdYEtza1F9dfwL6u6sviT4adaz0jij61ESa/t0=; b=DaqMEwGlG03BrQozbcORbkAjapAig9FU/5wYpyJ0ANBJ6ys7Y7JLTzhG4caxNCAO nHLoS1jskACAnA1Lzrujo8ck5ryEPHELUvb4AitVN4RGhaE/tNlR7vFIaMog9K8n6Ef joBkK4ITXmQcb5/rXsFjXaMA8bGsoR6Lc0oLaY0c= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=shh3fegwg5fppqsuzphvschd53n6ihuv; d=amazonses.com; t=1701268165; 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=vBEvlZ4Bwzau9pNwFz2xbF6tkBEsx5mpYHmD5IQmtN4nSy2lOhlJ0Cfh3TQ258U9 almicmMgFB1aHGZ+DduP5UaF76K7SpH9qnBc4j4GKg6SnermNrCxfcWiNba/CbWwTgq 76plq1a7js7IisVuROKH8OkMu0UN0B0gb1QbCTf8= Date: Wed, 29 Nov 2023 14:29:25 +0000 Mime-Version: 1.0 In-Reply-To: References: <3aca16d2ccc66d8f39f08ddcb9a4bbda30c9caa3.1701268112.git.reza@housseini.me> X-Mailer: Amazon WorkMail Thread-Index: AQHaItBgpBQ4R4lqRQW/cxQVMxxTZAAABNCr Thread-Topic: [PATCH v4 6/6] gnu: openfoam-com: Update to 2306. X-Wm-Sent-Timestamp: 1701268164 X-Original-Mailer: git-send-email 2.41.0 Message-ID: <0102018c1b7c1445-1ace1095-2585-4777-b163-26f247d87f01-000000@eu-west-1.amazonses.com> Feedback-ID: 1.eu-west-1.b24dn6frgCi6dh20skzbuMRr7UL8M6Soir/3ogtEjHQ=:AmazonSES X-SES-Outgoing: 2023.11.29-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-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"