From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id UEAwDRpLZ2VrEAAAauVa8A:P1 (envelope-from ) for ; Wed, 29 Nov 2023 15:30:50 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id UEAwDRpLZ2VrEAAAauVa8A (envelope-from ) for ; Wed, 29 Nov 2023 15:30:50 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id C3C9513772 for ; Wed, 29 Nov 2023 15:30:49 +0100 (CET) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=housseini.me header.s=solmzk3ljecfoypi3q6x2mqs3bucnhjw header.b="gfEdU/0Q"; dkim=fail ("headers rsa verify failed") header.d=amazonses.com header.s=shh3fegwg5fppqsuzphvschd53n6ihuv header.b=RD13h+m0; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1701268250; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=acjYX1RGzYQpBVVJ6ZrkJnWRjppHfhH7bL6hd85yD7o=; b=cf5bOhBdsM3TVXuG6TZcQQIhOdlKAA244KF9sAyU7I//qTEyrb804QNZXuKlCwrIb92602 hhpk5uwdryhLi4uANOcLyFyqjxqNRw+RBZxhoJ1ey+/V0SlNl75O2gH+Y/SF5DbGbYSN5x IkCIpo01JPdg+okuqYGkpw0BlM6/fTTXbOcmga+8sJlfGTO9nN3NQkrDpzzeXI03xiO7S3 8bCZmKVXW/3nGSLyldaL5ztB+DgfYGsw0WdjQhl4le3UHwLJsvJAnVvEnGZAbMWD4wj7Gp 6CTTcEmeE9JXX6pNhWb7ikv+gzNZE45Esl2LSn+nW4GTxLdsHl1CqVhiLUDHCw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1701268250; a=rsa-sha256; cv=none; b=QsI2Xw6d7yz3VAYCdlWRtdJ3+9bplxRyXICeMLeC61LiQZWPguxKyO/4YgwhccMCaFBv2t 8WpTaWvIA2zJ56izo5shVwkTPeawHOVO5xqIgj7mR158vgRUysALRjzgujAW1GmUB1bb4D h+44sBYaSo8lIihEAtsEkdkey505dmuPj9s+VSk45WN7HwXfng/DZWKy4x9yYOU0U6inMK KiF40H2g5ZlXykgmF07tjSIS0UWS74G9vzqBDXKBnn7oD9xf54EazRxiVLvhDureBOp47O PFfr4Lb6f5Ovf0UTtGS54D88KVosRybNceUli7w7sreILdUNYIwdr1AtGsZJhw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=housseini.me header.s=solmzk3ljecfoypi3q6x2mqs3bucnhjw header.b="gfEdU/0Q"; dkim=fail ("headers rsa verify failed") header.d=amazonses.com header.s=shh3fegwg5fppqsuzphvschd53n6ihuv header.b=RD13h+m0; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r8LZf-0007Ne-Fl; 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-0007M8-3u 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-00020F-D7 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 1r8LZi-0002d5-Qu for guix-patches@gnu.org; Wed, 29 Nov 2023 09:30:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#66262] [PATCH v4 1/6] 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: Wed, 29 Nov 2023 14:30: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.17012681579958 (code B ref 66262); Wed, 29 Nov 2023 14:30:02 +0000 Received: (at 66262) by debbugs.gnu.org; 29 Nov 2023 14:29:17 +0000 Received: from localhost ([127.0.0.1]:49219 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r8LYy-0002aY-OH for submit@debbugs.gnu.org; Wed, 29 Nov 2023 09:29:17 -0500 Received: from a2-48.smtp-out.eu-west-1.amazonses.com ([54.240.2.48]:47683) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <0102018c1b7b9bde-2db93a73-9870-4286-a7f7-1687cd6b849c-000000@mail.housseini.me>) id 1r8LYw-0002aE-4w for 66262@debbugs.gnu.org; Wed, 29 Nov 2023 09:29:15 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=solmzk3ljecfoypi3q6x2mqs3bucnhjw; d=housseini.me; t=1701268135; h=Subject:From:To:Cc:Date:Mime-Version:Content-Type:Content-Transfer-Encoding:References:Message-Id; bh=yQTDZ3NKrji/K0PMeZj5teEafsc/jarDI+UisjCohfQ=; b=gfEdU/0Q1IxT6lBgsV6XifyYt4Y1jRi6HONJ92Ou2lGW62hIumqChQI0qhqk3sHg PhVB1XZIDDsrXKI9v8lvrWQanGmuY2d9KZzQ+sdJoM0nsPojc2be71lqZQFwNdSwZi6 kbrqr5GsIC9V9xDpu1vBjprbdRWFd5cNmSkUs7A0= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=shh3fegwg5fppqsuzphvschd53n6ihuv; d=amazonses.com; t=1701268135; h=Subject:From:To:Cc:Date:Mime-Version:Content-Type:Content-Transfer-Encoding:References:Message-Id:Feedback-ID; bh=yQTDZ3NKrji/K0PMeZj5teEafsc/jarDI+UisjCohfQ=; b=RD13h+m0Rtu22/8qlzvBMCdsX5zOPX0TiXefQR/4iTXCxpr8vrVImqFcfEE8Jbet NXEMWGN0j1qgxhrhMiPIJQ/YgRLP4kpBZkNmafJA006Rk9GBZr3ZyGRya03RZmwxhSz rpEAuhC8HIbygUrr2ceyjv0UdeE3dYyPDWZLfXFs= Date: Wed, 29 Nov 2023 14:28:54 +0000 Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable References: X-Mailer: Amazon WorkMail Thread-Index: AQHaItBgpBQ4R4lqRQW/cxQVMxxTZA== Thread-Topic: [PATCH v4 1/6] gnu: openfoam-org: Use gexps. X-Wm-Sent-Timestamp: 1701268133 X-Original-Mailer: git-send-email 2.41.0 Message-ID: <0102018c1b7b9bde-2db93a73-9870-4286-a7f7-1687cd6b849c-000000@eu-west-1.amazonses.com> Feedback-ID: 1.eu-west-1.b24dn6frgCi6dh20skzbuMRr7UL8M6Soir/3ogtEjHQ=:AmazonSES X-SES-Outgoing: 2023.11.29-54.240.2.48 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 From: reza via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Scanner: mx11.migadu.com X-Migadu-Spam-Score: -6.13 X-Spam-Score: -6.13 X-Migadu-Queue-Id: C3C9513772 X-TUID: 0L9LSROBGX8Q * gnu/packages/simulation.scm (openfoam-org): Use gexps, other cosmetic c= hanges.=0D=0A=0D=0AChange-Id: I856d9660559cb4656251cba6bc5dd31d004f1b74=0D= =0A---=0D=0A gnu/packages/simulation.scm | 32 ++++++++++++---------------= -----=0D=0A 1 file changed, 12 insertions(+), 20 deletions(-)=0D=0A=0D=0A= diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm=0D= =0Aindex b2fb123815..cb6f07c383 100644=0D=0A--- a/gnu/packages/simulation= =2Escm=0D=0A+++ b/gnu/packages/simulation.scm=0D=0A@@ -238,13 +238,10 @@ = (define-public openfoam-org=0D=0A (string-append "export= SCOTCH_VERSION=3Dscotch_"=0D=0A #$(packa= ge-version pt-scotch32) "\n"))=0D=0A (("^export SCOTCH_AR= CH_PATH=3D.*$")=0D=0A- (string-append "export SCOTCH_ARCH= _PATH=3D"=0D=0A- (assoc-ref %build-inputs = "pt-scotch32")=0D=0A- "\n"))) #t))=0D=0A+ = (string-append "export SCOTCH_ARCH_PATH=3D" #$pt-scotch32= "\n"))) #t))=0D=0A (add-before 'build 'patch-mpi=0D=0A = (lambda _=0D=0A- (let* ((mpi-path (assoc-ref %build-inp= uts "openmpi"))=0D=0A- (mpi-version #$(package-versio= n openmpi)))=0D=0A+ (let* ((mpi-version #$(package-version o= penmpi)))=0D=0A ;; specify openmpi type=0D=0A = (substitute* "etc/bashrc"=0D=0A (("WM_MPLIB=3DSYST= EMOPENMPI")=0D=0A@@ -254,8 +251,7 @@ (define-public openfoam-org=0D=0A = (string-append "export FOAM_MPI=3Dopenmpi-"=0D=0A = mpi-version "\n"))=0D=0A ((= "export MPI_ARCH_PATH=3D.*\\$FOAM_MPI.*$")=0D=0A- (stri= ng-append "export MPI_ARCH_PATH=3D" mpi-path=0D=0A- = "\n")))) #t))=0D=0A+ (string-append "export= MPI_ARCH_PATH=3D" #$openmpi "\n")))) #t))=0D=0A (add-before 'b= uild 'patch-paraview=0D=0A (lambda _=0D=0A (sub= stitute* "etc/config.sh/paraview"=0D=0A@@ -263,12 +259,11 @@ (define-publ= ic openfoam-org=0D=0A (string-append "export ParaView_VE= RSION=3D"=0D=0A #$(package-version paravi= ew) "\n"))=0D=0A (("^export ParaView_DIR=3D.*$")=0D=0A- = (string-append "export ParaView_DIR=3D"=0D=0A- = (assoc-ref %build-inputs "paraview")=0D=0A- = "\n"))) #t))=0D=0A+ (string-append = "export ParaView_DIR=3D" #$paraview "\n"))) #t))=0D=0A (add-bef= ore 'build 'add-rpaths=0D=0A (lambda _=0D=0A- (l= etrec* ((libraries '("boost" "cgal"=0D=0A+ (letrec* ((librar= ies '("boost"=0D=0A+ "cgal"=0D=0A = "gmp"=0D=0A = "metis"=0D=0A "mpfr"=0D=0A= @@ -277,11 +272,10 @@ (define-public openfoam-org=0D=0A = "zlib"=0D=0A "pa= raview"))=0D=0A (rpaths=0D=0A- = (fold-right (lambda (library rpaths)=0D=0A+ = (fold-right (lambda (lib rpaths)=0D=0A = (string-append rpaths=0D=0A = "-rpath=3D"=0D=0A- = (assoc-ref=0D=0A- = %build-inputs library)=0D=0A+ = (assoc-ref %build-inputs lib)=0D=0A = "/lib,")) "" libraries))=0D=0A = (openfoam-lib=0D=0A (strin= g-append #$output=0D=0A@@ -307,13 +301,11 @@ (define-public openfoam-org=0D= =0A (lambda _=0D=0A (let* ((vtk-version #$(vers= ion-major+minor=0D=0A (package-versi= on vtk)))=0D=0A- (vtk-root (assoc-ref %build-inputs "= vtk"))=0D=0A- (vtk-inc (string-append vtk-root "/incl= ude/vtk-" vtk-version))=0D=0A+ (vtk-inc (string-appen= d #$vtk "/include/vtk-" vtk-version))=0D=0A (vtk-inc= -flag (string-append "-I" vtk-inc)))=0D=0A (substitute* "= wmake/rules/linux64Gcc/c++"=0D=0A (("\\$\\(LIB_HEADER_D= IRS\\)" all)=0D=0A- (string-append all " " vtk-inc-flag= " "))))=0D=0A- #t))=0D=0A+ (string-append= all " " vtk-inc-flag " ")))) #t))=0D=0A (delete 'configure) ;n= o configure phase=0D=0A (replace 'build=0D=0A (lamb= da _=0D=0A@@ -400,6 +392,7 @@ (define-public openfoam-org=0D=0A ;; $ = cd pitzDaily=0D=0A ;; $ chmod -R u+w .=0D=0A ;; $ blockMesh=0D=0A= + (home-page "https://openfoam.org")=0D=0A (synopsis "Framework fo= r numerical simulation of fluid flow")=0D=0A (description=0D=0A = "OpenFOAM provides a set of solvers and methods for tackling=0D=0A@@ -410= ,8 +403,7 @@ (define-public openfoam-org=0D=0A sharp gradients, such as t= hose encountered in flows with shock waves and flows=0D=0A with gas/liqui= d interfaces. Large problems may be split into smaller, connected=0D=0A = problems for efficient solution on parallel systems.")=0D=0A- (license= license:gpl3+)=0D=0A- (home-page "https://openfoam.org")))=0D=0A+ = (license license:gpl3+)))=0D=0A=20=0D=0A (define-public openfoam=0D=0A = (deprecated-package "openfoam" openfoam-org))=0D=0A=0D=0Abase-commit: e43= 97a32ac81d0b23b168df27424001a7d20aee7=0D=0A--=20=0D=0A2.41.0=0D=0A=0D=0A