From patchwork Fri Dec 1 20:21:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: reza X-Patchwork-Id: 57182 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 3184427BBE2; Fri, 1 Dec 2023 20:22:22 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-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 1229B27BBEC 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 1r9A1L-0004Uu-KS; Fri, 01 Dec 2023 15:21:55 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r9A1K-0004U8-2V 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-00059c-Q8 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-0000ZW-6M for guix-patches@gnu.org; Fri, 01 Dec 2023 15:22:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#66262] [PATCH v7 1/7] gnu: openfoam-org: Use gexps. In-Reply-To: <0102018ae02b1a04-440a9320-f59f-4304-bf10-01dfb00717ca-000000@eu-west-1.amazonses.com> Resent-From: reza Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: 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.17014621082122 (code B ref 66262); Fri, 01 Dec 2023 20:22:02 +0000 Received: (at 66262) by debbugs.gnu.org; 1 Dec 2023 20:21:48 +0000 Received: from localhost ([127.0.0.1]:56138 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9A1D-0000Y9-QE for submit@debbugs.gnu.org; Fri, 01 Dec 2023 15:21:48 -0500 Received: from a2-29.smtp-out.eu-west-1.amazonses.com ([54.240.2.29]:54405) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <0102018c270b0a37-63a6f14a-1c64-4d81-a00f-6333031854bf-000000@mail.housseini.me>) id 1r9A1A-0000Xs-Qt for 66262@debbugs.gnu.org; Fri, 01 Dec 2023 15:21:46 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=solmzk3ljecfoypi3q6x2mqs3bucnhjw; d=housseini.me; t=1701462084; h=Subject:From:To:Cc:Date:Mime-Version:Content-Type:Content-Transfer-Encoding:References:Message-Id; bh=mbxQK3bO8hqAZN6+/K59hMNXt/beC1SoSOk31SrUrIk=; b=EzPCQFoJ3BZKOk+0DMO9mjhctMQKUa4y487xU72YaFvmBo2pKjhPnved9/cdPdhQ cEoIweaZCRuzsWhqWTdzi4/SqDvmJSc7uBNgQ3GMrPYjkU2wKLxbhbCPgEYVVCys8FH g2R+Hvl9Hsgk39GQSin53fS39RjR//v4DHrvSVPk= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=shh3fegwg5fppqsuzphvschd53n6ihuv; d=amazonses.com; t=1701462084; h=Subject:From:To:Cc:Date:Mime-Version:Content-Type:Content-Transfer-Encoding:References:Message-Id:Feedback-ID; bh=mbxQK3bO8hqAZN6+/K59hMNXt/beC1SoSOk31SrUrIk=; b=ai2NE7SNmUvu320xIkz+D9UPF4NRHita6r/DyJtVVRAOM3cqPg9CVxeEp18kBF8g 6NExSWfmSoChGBHbLsUfD3xl9vp/27NqtM1Z0iXxsXGfX1qOMNndxxrreDMDZ/+UM9Z eYmrrpmB+jW8ptqvAnYChC0IcCDNbjQHS3M0b230= Date: Fri, 1 Dec 2023 20:21:24 +0000 Mime-Version: 1.0 References: <5a90ca452eac7f8947a241bf0900ca928acc311f.1701462064.git.reza@housseini.me> X-Mailer: Amazon WorkMail Thread-Index: AQHaJJPzxeoHSzDjRfGKH1PaN4MhNQ== Thread-Topic: [PATCH v7 1/7] gnu: openfoam-org: Use gexps. X-Wm-Sent-Timestamp: 1701462083 X-Original-Mailer: git-send-email 2.41.0 Message-ID: <0102018c270b0a37-63a6f14a-1c64-4d81-a00f-6333031854bf-000000@eu-west-1.amazonses.com> Feedback-ID: 1.eu-west-1.b24dn6frgCi6dh20skzbuMRr7UL8M6Soir/3ogtEjHQ=:AmazonSES X-SES-Outgoing: 2023.12.01-54.240.2.29 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): Use gexps, other cosmetic changes. Change-Id: I856d9660559cb4656251cba6bc5dd31d004f1b74 --- gnu/packages/simulation.scm | 32 ++++++++++++-------------------- 1 file changed, 12 insertions(+), 20 deletions(-) base-commit: cd46757c1a0f886848fbb6828c028dd2a2532767 -- 2.41.0 diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm index b2fb123815..cb6f07c383 100644 --- a/gnu/packages/simulation.scm +++ b/gnu/packages/simulation.scm @@ -238,13 +238,10 @@ (define-public openfoam-org (string-append "export SCOTCH_VERSION=scotch_" #$(package-version pt-scotch32) "\n")) (("^export SCOTCH_ARCH_PATH=.*$") - (string-append "export SCOTCH_ARCH_PATH=" - (assoc-ref %build-inputs "pt-scotch32") - "\n"))) #t)) + (string-append "export SCOTCH_ARCH_PATH=" #$pt-scotch32 "\n"))) #t)) (add-before 'build 'patch-mpi (lambda _ - (let* ((mpi-path (assoc-ref %build-inputs "openmpi")) - (mpi-version #$(package-version openmpi))) + (let* ((mpi-version #$(package-version openmpi))) ;; specify openmpi type (substitute* "etc/bashrc" (("WM_MPLIB=SYSTEMOPENMPI") @@ -254,8 +251,7 @@ (define-public openfoam-org (string-append "export FOAM_MPI=openmpi-" mpi-version "\n")) (("export MPI_ARCH_PATH=.*\\$FOAM_MPI.*$") - (string-append "export MPI_ARCH_PATH=" mpi-path - "\n")))) #t)) + (string-append "export MPI_ARCH_PATH=" #$openmpi "\n")))) #t)) (add-before 'build 'patch-paraview (lambda _ (substitute* "etc/config.sh/paraview" @@ -263,12 +259,11 @@ (define-public openfoam-org (string-append "export ParaView_VERSION=" #$(package-version paraview) "\n")) (("^export ParaView_DIR=.*$") - (string-append "export ParaView_DIR=" - (assoc-ref %build-inputs "paraview") - "\n"))) #t)) + (string-append "export ParaView_DIR=" #$paraview "\n"))) #t)) (add-before 'build 'add-rpaths (lambda _ - (letrec* ((libraries '("boost" "cgal" + (letrec* ((libraries '("boost" + "cgal" "gmp" "metis" "mpfr" @@ -277,11 +272,10 @@ (define-public openfoam-org "zlib" "paraview")) (rpaths - (fold-right (lambda (library rpaths) + (fold-right (lambda (lib rpaths) (string-append rpaths "-rpath=" - (assoc-ref - %build-inputs library) + (assoc-ref %build-inputs lib) "/lib,")) "" libraries)) (openfoam-lib (string-append #$output @@ -307,13 +301,11 @@ (define-public openfoam-org (lambda _ (let* ((vtk-version #$(version-major+minor (package-version vtk))) - (vtk-root (assoc-ref %build-inputs "vtk")) - (vtk-inc (string-append vtk-root "/include/vtk-" vtk-version)) + (vtk-inc (string-append #$vtk "/include/vtk-" vtk-version)) (vtk-inc-flag (string-append "-I" vtk-inc))) (substitute* "wmake/rules/linux64Gcc/c++" (("\\$\\(LIB_HEADER_DIRS\\)" all) - (string-append all " " vtk-inc-flag " ")))) - #t)) + (string-append all " " vtk-inc-flag " ")))) #t)) (delete 'configure) ;no configure phase (replace 'build (lambda _ @@ -400,6 +392,7 @@ (define-public openfoam-org ;; $ cd pitzDaily ;; $ chmod -R u+w . ;; $ blockMesh + (home-page "https://openfoam.org") (synopsis "Framework for numerical simulation of fluid flow") (description "OpenFOAM provides a set of solvers and methods for tackling @@ -410,8 +403,7 @@ (define-public openfoam-org sharp gradients, such as those encountered in flows with shock waves and flows with gas/liquid interfaces. Large problems may be split into smaller, connected problems for efficient solution on parallel systems.") - (license license:gpl3+) - (home-page "https://openfoam.org"))) + (license license:gpl3+))) (define-public openfoam (deprecated-package "openfoam" openfoam-org))