From patchwork Wed Nov 29 20:39:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: reza X-Patchwork-Id: 57121 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 7FA5D27BBEA; Wed, 29 Nov 2023 20:41: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=-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 32F5E27BBE2 for ; Wed, 29 Nov 2023 20:41:35 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r8RMk-0000iE-Dg; Wed, 29 Nov 2023 15:41:02 -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 1r8RMe-0000gi-Ih for guix-patches@gnu.org; Wed, 29 Nov 2023 15:40:59 -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 1r8RMe-0004dF-Am for guix-patches@gnu.org; Wed, 29 Nov 2023 15:40:56 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r8RMl-0007t6-Vg for guix-patches@gnu.org; Wed, 29 Nov 2023 15:41:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#66262] [PATCH v5 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 20:41: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.170129042330242 (code B ref 66262); Wed, 29 Nov 2023 20:41:03 +0000 Received: (at 66262) by debbugs.gnu.org; 29 Nov 2023 20:40:23 +0000 Received: from localhost ([127.0.0.1]:51575 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r8RM6-0007rd-Uq for submit@debbugs.gnu.org; Wed, 29 Nov 2023 15:40:23 -0500 Received: from a2-87.smtp-out.eu-west-1.amazonses.com ([54.240.2.87]:58141) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <0102018c1ccf4b62-56604a1d-c6a5-4bd3-9c3b-d17fc61d1746-000000@mail.housseini.me>) id 1r8RLz-0007qv-JD for 66262@debbugs.gnu.org; Wed, 29 Nov 2023 15:40:16 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=solmzk3ljecfoypi3q6x2mqs3bucnhjw; d=housseini.me; t=1701290396; h=Subject:From:To:Cc:Date:Mime-Version:Content-Type:Content-Transfer-Encoding:In-Reply-To:References:Message-Id; bh=smgF/ns83/rJMIepOTXS4xGB5qvL5qrAXmVg1VoO9bo=; b=lr4PsoHEFv9w7rmYaikBw/H+957uELSJ6uX9XLT9HNzzRKD2OMkHVo1NkFIplm29 V/IJWf0U1gqujobk7IAGf0N7gEUH3tJ8gc49YrlvSS9H97I4JkemOyHSaSxMnM/6PR4 91NbLd6z9gkIQDvzEsE/x21aOESAnubgpddD5XGg= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=shh3fegwg5fppqsuzphvschd53n6ihuv; d=amazonses.com; t=1701290396; 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=oexQ4Q3C3RejoSr8FyNLLbIb6QRjciiQ8EdH9LLGG9LTvsWJvYeDurjafMFwi2WY nBtU//bJu0cPopPk7aTub18m0ASLHiQXvCtns1FA38ro9HqY75rSxvhQg98MnEdt3GI 70B+Bi/HMuxSA4Ppao/nS286d6mKOyq246CZ2WHU= Date: Wed, 29 Nov 2023 20:39:56 +0000 Mime-Version: 1.0 In-Reply-To: <5a90ca452eac7f8947a241bf0900ca928acc311f.1701290362.git.reza@housseini.me> References: <5a90ca452eac7f8947a241bf0900ca928acc311f.1701290362.git.reza@housseini.me> X-Mailer: Amazon WorkMail Thread-Index: AQHaIwQod43bSScuRrGYEX9KqcuZbAAAAFvT Thread-Topic: [PATCH v5 2/6] gnu: openfoam-org: Refactor dependency. X-Wm-Sent-Timestamp: 1701290395 X-Original-Mailer: git-send-email 2.41.0 Message-ID: <0102018c1ccf4b62-56604a1d-c6a5-4bd3-9c3b-d17fc61d1746-000000@eu-west-1.amazonses.com> Feedback-ID: 1.eu-west-1.b24dn6frgCi6dh20skzbuMRr7UL8M6Soir/3ogtEjHQ=:AmazonSES X-SES-Outgoing: 2023.11.29-54.240.2.87 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 20:39:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: reza X-Patchwork-Id: 57116 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 345A227BBEC; Wed, 29 Nov 2023 20:40:27 +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 26EB827BBE9 for ; Wed, 29 Nov 2023 20:40:23 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r8RLj-0000RI-Td; Wed, 29 Nov 2023 15:40:00 -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 1r8RLh-0000J3-3k for guix-patches@gnu.org; Wed, 29 Nov 2023 15:39: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 1r8RLg-0004D2-Rp for guix-patches@gnu.org; Wed, 29 Nov 2023 15:39:56 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r8RLn-0007qR-GM for guix-patches@gnu.org; Wed, 29 Nov 2023 15:40:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#66262] [PATCH v5 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 20:40: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.170129039830121 (code B ref 66262); Wed, 29 Nov 2023 20:40:03 +0000 Received: (at 66262) by debbugs.gnu.org; 29 Nov 2023 20:39:58 +0000 Received: from localhost ([127.0.0.1]:51561 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r8RLh-0007pk-Ge for submit@debbugs.gnu.org; Wed, 29 Nov 2023 15:39:57 -0500 Received: from a2-83.smtp-out.eu-west-1.amazonses.com ([54.240.2.83]:47833) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <0102018c1ccefd42-56f59917-da2f-47d0-811f-63af76b3da98-000000@mail.housseini.me>) id 1r8RLf-0007pI-FO for 66262@debbugs.gnu.org; Wed, 29 Nov 2023 15:39:56 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=solmzk3ljecfoypi3q6x2mqs3bucnhjw; d=housseini.me; t=1701290376; h=Subject:From:To:Cc:Date:Mime-Version:Content-Type:Content-Transfer-Encoding:In-Reply-To:References:Message-Id; bh=m2AT8XjEcCsN4AmP6DQqzR6IdqVJFZiIFxK7MUBQi+s=; b=XeOIsj6yWAEp8rLOmPl/Jn2jd13FnG8EVYy6XoTZvnSt7KHEbFz7X8O04ONNFC7Z UAis+4kXqfG74ZDeKYq9pCoHgsmHjOrwYwVcQkeqAQJvNu/CW/xVD4WzX0AVzNk4F/Z 9DC0hXVoCTELTdaw/gbxJHI9rb+IQt9oL/7CnCF0= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=shh3fegwg5fppqsuzphvschd53n6ihuv; d=amazonses.com; t=1701290376; 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=hmoCqARuzAFlLCLFlez2BZ1z4HslRFL4IE8iah6WviP9q53xivcNk0kUuaCeqUD1 qGI8LijbdFe3JSbQW+l/ghbSbO3JEKysAs4PiJPQeDccM5BxdcoOPtqoi0A/mciXsbx PRCdl8ewfaOs1RiXilwjM5enBrEzng6sj7fE46nw= Date: Wed, 29 Nov 2023 20:39:36 +0000 Mime-Version: 1.0 In-Reply-To: <5a90ca452eac7f8947a241bf0900ca928acc311f.1701290362.git.reza@housseini.me> References: <5a90ca452eac7f8947a241bf0900ca928acc311f.1701290362.git.reza@housseini.me> X-Mailer: Amazon WorkMail Thread-Index: AQHaIwQod43bSScuRrGYEX9KqcuZbAAAAIGI Thread-Topic: [PATCH v5 3/6] gnu: openfoam-org: Improve internal path handling. X-Wm-Sent-Timestamp: 1701290375 X-Original-Mailer: git-send-email 2.41.0 Message-ID: <0102018c1ccefd42-56f59917-da2f-47d0-811f-63af76b3da98-000000@eu-west-1.amazonses.com> Feedback-ID: 1.eu-west-1.b24dn6frgCi6dh20skzbuMRr7UL8M6Soir/3ogtEjHQ=:AmazonSES X-SES-Outgoing: 2023.11.29-54.240.2.83 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 20:39:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: reza X-Patchwork-Id: 57120 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 2B50327BBEA; Wed, 29 Nov 2023 20:41:24 +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 9F9D927BBE2 for ; Wed, 29 Nov 2023 20:41:23 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r8RMj-0000hD-SZ; Wed, 29 Nov 2023 15:41: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 1r8RMd-0000gU-NU for guix-patches@gnu.org; Wed, 29 Nov 2023 15:40: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 1r8RMd-0004d4-FF for guix-patches@gnu.org; Wed, 29 Nov 2023 15:40:55 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r8RMl-0007sr-4c for guix-patches@gnu.org; Wed, 29 Nov 2023 15:41:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#66262] [PATCH v5 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 20:41: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.170129042230229 (code B ref 66262); Wed, 29 Nov 2023 20:41:03 +0000 Received: (at 66262) by debbugs.gnu.org; 29 Nov 2023 20:40:22 +0000 Received: from localhost ([127.0.0.1]:51571 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r8RM6-0007rO-7M for submit@debbugs.gnu.org; Wed, 29 Nov 2023 15:40:22 -0500 Received: from a2-22.smtp-out.eu-west-1.amazonses.com ([54.240.2.22]:47749) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <0102018c1ccf0d0d-9fb0ccc6-9db3-4cee-afed-de5446aecf79-000000@mail.housseini.me>) id 1r8RLj-0007pO-LM for 66262@debbugs.gnu.org; Wed, 29 Nov 2023 15:40:00 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=solmzk3ljecfoypi3q6x2mqs3bucnhjw; d=housseini.me; t=1701290380; h=Subject:From:To:Cc:Date:Mime-Version:Content-Type:Content-Transfer-Encoding:In-Reply-To:References:Message-Id; bh=h+36u6Gh6c1IvfFFXpjDTCLXufFhhLuYMpHxNyVFUbc=; b=ApHN6GnxzL6DoxqySklrDgbwqrLir9R42D1iwIsEWqrkT3QuDSn/Kk10DbhG1vCy k+4xRYeIo44sbak6VPwWAvInsTdmZMEP6injYD1ADOQMpQIUwiRhHgInblv/l1M2TVf 35OzRhV3pVwEfleaYWpjTMrPVQTkbLRGdtGCCLuU= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=shh3fegwg5fppqsuzphvschd53n6ihuv; d=amazonses.com; t=1701290380; 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=RDBqyEu/NcTSXz9VbIP/xfGgobHz48j3Iqqx3nZ5OP0mlOnBPGQMAAo+PDvt67Yi Cn/mhiE8dBNhIS0gty0txF4q4kgoYIgiI8aLwmOt5VXFiwXC68NQtBNpH4DHhwiatcE ECZnrYJDLlD2AeZ17u/KKztUiRGU8alWPr/P+JVw= Date: Wed, 29 Nov 2023 20:39:40 +0000 Mime-Version: 1.0 In-Reply-To: <5a90ca452eac7f8947a241bf0900ca928acc311f.1701290362.git.reza@housseini.me> References: <5a90ca452eac7f8947a241bf0900ca928acc311f.1701290362.git.reza@housseini.me> <54b1a2d73885ed2f5fef4f74fde212f9c811ce66.1701290362.git.reza@housseini.me> X-Mailer: Amazon WorkMail Thread-Index: AQHaIwQod43bSScuRrGYEX9KqcuZbAAAAKm2 Thread-Topic: [PATCH v5 4/6] gnu: openfoam-org: Improve build clean up. X-Wm-Sent-Timestamp: 1701290379 X-Original-Mailer: git-send-email 2.41.0 Message-ID: <0102018c1ccf0d0d-9fb0ccc6-9db3-4cee-afed-de5446aecf79-000000@eu-west-1.amazonses.com> Feedback-ID: 1.eu-west-1.b24dn6frgCi6dh20skzbuMRr7UL8M6Soir/3ogtEjHQ=:AmazonSES X-SES-Outgoing: 2023.11.29-54.240.2.22 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 20:39:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: reza X-Patchwork-Id: 57118 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 72DB727BBEA; Wed, 29 Nov 2023 20:41:08 +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 5C49F27BBE2 for ; Wed, 29 Nov 2023 20:41:07 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r8RMi-0000hC-AI; Wed, 29 Nov 2023 15:41:00 -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 1r8RMd-0000gN-8W for guix-patches@gnu.org; Wed, 29 Nov 2023 15:40: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 1r8RMd-0004cz-0f for guix-patches@gnu.org; Wed, 29 Nov 2023 15:40:55 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r8RMk-0007sk-Lk for guix-patches@gnu.org; Wed, 29 Nov 2023 15:41:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#66262] [PATCH v5 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 20:41: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.170129042230222 (code B ref 66262); Wed, 29 Nov 2023 20:41:02 +0000 Received: (at 66262) by debbugs.gnu.org; 29 Nov 2023 20:40:22 +0000 Received: from localhost ([127.0.0.1]:51567 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r8RLr-0007qp-1c for submit@debbugs.gnu.org; Wed, 29 Nov 2023 15:40:22 -0500 Received: from a2-34.smtp-out.eu-west-1.amazonses.com ([54.240.2.34]:60283) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <0102018c1ccf052e-66e376ea-d0b1-440b-8173-ea80f606f775-000000@mail.housseini.me>) id 1r8RLh-0007pM-KN for 66262@debbugs.gnu.org; Wed, 29 Nov 2023 15:39:58 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=solmzk3ljecfoypi3q6x2mqs3bucnhjw; d=housseini.me; t=1701290378; h=Subject:From:To:Cc:Date:Mime-Version:Content-Type:Content-Transfer-Encoding:In-Reply-To:References:Message-Id; bh=x7fmBkfwzPXA+i6BWQJBCgPA9eXMxZm8Mum8rRMwCZI=; b=nBnW6op4/wNmINgx8BvIX8BfmFhMCXfntUw0UW0TWQDESXVfhtUxkX/p3frBuy4H d27rKqvivdblNzthZY2HiVtIMnUv8M7+ygKFA1Gw6cOMM8cn6ECSBOylsHQxR5MnEqD 91DUH1xr2UmPUcdJU6D7QWnhqN5xB3ONJzk86IKw= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=shh3fegwg5fppqsuzphvschd53n6ihuv; d=amazonses.com; t=1701290378; 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=DUzQ8Em57NsgDQfmpqx5Cr+It3WDDBgw18QR8BSXS4KlBYI8bFW0V9+uoomNmpJG syyes3cYbkTget6FDOiK/RNeax09yuWPDYE513azvrCMfK1UHOGjvcFw3MkOlx9ycZ6 C/6th8b30BICenK7WH14Aqy45lWDfr9ry7q9im6c= Date: Wed, 29 Nov 2023 20:39:38 +0000 Mime-Version: 1.0 In-Reply-To: <5a90ca452eac7f8947a241bf0900ca928acc311f.1701290362.git.reza@housseini.me> References: <5a90ca452eac7f8947a241bf0900ca928acc311f.1701290362.git.reza@housseini.me> X-Mailer: Amazon WorkMail Thread-Index: AQHaIwQod43bSScuRrGYEX9KqcuZbAAAANCi Thread-Topic: [PATCH v5 5/6] gnu: openfoam-org: Update to 11. X-Wm-Sent-Timestamp: 1701290377 X-Original-Mailer: git-send-email 2.41.0 Message-ID: <0102018c1ccf052e-66e376ea-d0b1-440b-8173-ea80f606f775-000000@eu-west-1.amazonses.com> Feedback-ID: 1.eu-west-1.b24dn6frgCi6dh20skzbuMRr7UL8M6Soir/3ogtEjHQ=:AmazonSES X-SES-Outgoing: 2023.11.29-54.240.2.34 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 20:39:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: reza X-Patchwork-Id: 57119 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 5EA4C27BBE9; Wed, 29 Nov 2023 20:41: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=-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 D47A627BBE2 for ; Wed, 29 Nov 2023 20:41:18 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r8RMj-0000hE-Sh; Wed, 29 Nov 2023 15:41: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 1r8RMe-0000gh-HL for guix-patches@gnu.org; Wed, 29 Nov 2023 15:40:59 -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 1r8RMd-0004dC-T2 for guix-patches@gnu.org; Wed, 29 Nov 2023 15:40:56 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r8RMl-0007sz-IJ for guix-patches@gnu.org; Wed, 29 Nov 2023 15:41:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#66262] [PATCH v5 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 20:41: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.170129042330236 (code B ref 66262); Wed, 29 Nov 2023 20:41:03 +0000 Received: (at 66262) by debbugs.gnu.org; 29 Nov 2023 20:40:23 +0000 Received: from localhost ([127.0.0.1]:51573 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r8RM6-0007rW-Je for submit@debbugs.gnu.org; Wed, 29 Nov 2023 15:40:22 -0500 Received: from a50-74.smtp-out.eu-west-1.amazonses.com ([54.240.50.74]:60825) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <0102018c1ccf38d0-8d630963-7b7e-45c3-8ff5-e34503334350-000000@mail.housseini.me>) id 1r8RLu-0007qk-Qf for 66262@debbugs.gnu.org; Wed, 29 Nov 2023 15:40:14 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=solmzk3ljecfoypi3q6x2mqs3bucnhjw; d=housseini.me; t=1701290391; h=Subject:From:To:Cc:Date:Mime-Version:Content-Type:Content-Transfer-Encoding:In-Reply-To:References:Message-Id; bh=4wzD5LdYEtza1F9dfwL6u6sviT4adaz0jij61ESa/t0=; b=GLRy6vpBdm7/JfXxH+bmkfmyZJZPgSQOF5FxM2/jp1ty9cKcX1xixFjBOB1xdr+0 76K7yJoXjtOSnJano7mQjPvaMo2mHhxPlE5D7EfsZ6p1Src+uL4bCCMIzDFJ94JywGn /cqjC4xKqRsjL1IJdLzj2NShq4GxQQuVijE/QLHQ= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=shh3fegwg5fppqsuzphvschd53n6ihuv; d=amazonses.com; t=1701290391; 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=Lt5I6vRk9KtUtl2aKxOS+kPhS9un6C+fAfHB4S5vTmMFoPmkAagCGyRJ+ZxydY21 z67WbSijmHqEp3AZVRjIGwnzBeDNX7wJqvtoCdHcpJgGEPpysVpy+iFSHCrcKN1SGH0 Znta3zPtkfEFrR4Hy6KpXgGddgu0ilRWNWpaio64= Date: Wed, 29 Nov 2023 20:39:51 +0000 Mime-Version: 1.0 In-Reply-To: <5a90ca452eac7f8947a241bf0900ca928acc311f.1701290362.git.reza@housseini.me> References: <5a90ca452eac7f8947a241bf0900ca928acc311f.1701290362.git.reza@housseini.me> <1e5198861de5777cb1ad76b7919bc80870b54585.1701290362.git.reza@housseini.me> X-Mailer: Amazon WorkMail Thread-Index: AQHaIwQod43bSScuRrGYEX9KqcuZbAAAAPoG Thread-Topic: [PATCH v5 6/6] gnu: openfoam-com: Update to 2306. X-Wm-Sent-Timestamp: 1701290390 X-Original-Mailer: git-send-email 2.41.0 Message-ID: <0102018c1ccf38d0-8d630963-7b7e-45c3-8ff5-e34503334350-000000@eu-west-1.amazonses.com> Feedback-ID: 1.eu-west-1.b24dn6frgCi6dh20skzbuMRr7UL8M6Soir/3ogtEjHQ=:AmazonSES X-SES-Outgoing: 2023.11.29-54.240.50.74 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"