From patchwork Tue Oct 10 06:25:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: reza X-Patchwork-Id: 54704 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 96F1827BBEA; Tue, 10 Oct 2023 07:26:49 +0100 (BST) 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 AEF7127BBE2 for ; Tue, 10 Oct 2023 07:26:48 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qq6CZ-00024X-Kc; Tue, 10 Oct 2023 02:26:43 -0400 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 1qq6CY-000240-36 for guix-patches@gnu.org; Tue, 10 Oct 2023 02:26:42 -0400 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 1qq6CX-0002iB-Rh for guix-patches@gnu.org; Tue, 10 Oct 2023 02:26:41 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qq6Cs-00070q-RG for guix-patches@gnu.org; Tue, 10 Oct 2023 02:27:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66262] [PATCH v3 3/3] gnu: openfoam-com: Update to 2306. Resent-From: reza Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 10 Oct 2023 06:27: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.169691916926864 (code B ref 66262); Tue, 10 Oct 2023 06:27:02 +0000 Received: (at 66262) by debbugs.gnu.org; 10 Oct 2023 06:26:09 +0000 Received: from localhost ([127.0.0.1]:33852 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qq6C0-0006zD-N9 for submit@debbugs.gnu.org; Tue, 10 Oct 2023 02:26:09 -0400 Received: from a2-52.smtp-out.eu-west-1.amazonses.com ([54.240.2.52]:44029) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <0102018b184310e5-7c285620-deb5-4893-a60e-e9e94da60816-000000@mail.housseini.me>) id 1qq6Bu-0006xr-M4 for 66262@debbugs.gnu.org; Tue, 10 Oct 2023 02:26:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=solmzk3ljecfoypi3q6x2mqs3bucnhjw; d=housseini.me; t=1696919130; h=Subject:From:To:Cc:Date:Mime-Version:Content-Type:Content-Transfer-Encoding:In-Reply-To:References:Message-Id; bh=YKTRPrBnHuzNUs0gKvcxEIo+fkDnl1+3hR2WQ5Q0b3Y=; b=ZTQN+ZfbA0bVIELD/wCqwoInxikTDVjNmty8sDG+tIs8TpbywcdD4ruxW8p9T+Wx sLeCv6BihOTeur5qiiIvErt0FWg56ZGYf4muVDTzNm16PgEK0Hmvx2rB6wbejDkmEws hvkwA+yWcKCZo4MIkrShFW59C0hfjbBHFdHrpDEQ= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=shh3fegwg5fppqsuzphvschd53n6ihuv; d=amazonses.com; t=1696919130; h=Subject:From:To:Cc:Date:Mime-Version:Content-Type:Content-Transfer-Encoding:In-Reply-To:References:Message-Id:Feedback-ID; bh=YKTRPrBnHuzNUs0gKvcxEIo+fkDnl1+3hR2WQ5Q0b3Y=; b=FdO78XfJCglGO7OowqCgmPGudgMlqXbAzzwLFmkF9vKtucNNtPUVl3jVq20ShUQE bzmz/lb5iqd5FlkurinE6mNXyBjldY/8paQmBb11MMVvtpm3P2HunOrncMA9LuDWwap ntnNvUJUyLmM0M9Ptyowed5b+3kqW5uyM6tmQOFs= Date: Tue, 10 Oct 2023 06:25:30 +0000 Mime-Version: 1.0 In-Reply-To: References: X-Mailer: Amazon WorkMail Thread-Index: AQHZ+0KLumvKmCKhSmOZLKw0EepbNQAAAVBJ Thread-Topic: [PATCH v3 3/3] gnu: openfoam-com: Update to 2306. X-Wm-Sent-Timestamp: 1696919129 X-Original-Mailer: git-send-email 2.41.0 Message-ID: <0102018b184310e5-7c285620-deb5-4893-a60e-e9e94da60816-000000@eu-west-1.amazonses.com> Feedback-ID: 1.eu-west-1.b24dn6frgCi6dh20skzbuMRr7UL8M6Soir/3ogtEjHQ=:AmazonSES X-SES-Outgoing: 2023.10.10-54.240.2.52 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 (openfoam-com): Update to 2306. Use openfoam-package factory function to create package. --- gnu/packages/simulation.scm | 58 +++++++++++++++++++------------------ 1 file changed, 30 insertions(+), 28 deletions(-) -- 2.41.0 diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm index 6ce15a2c2d..f44e1dbf6f 100644 --- a/gnu/packages/simulation.scm +++ b/gnu/packages/simulation.scm @@ -429,37 +429,39 @@ (define-public openfoam (define-public openfoam-com ;; This is a fork of 'openfoam-org', maintained separately. - (package - (inherit openfoam-org) - (name "openfoam-com") - (version "2212") - (source (origin - (method url-fetch) - (uri (string-append "https://develop.openfoam.com" - "/Development/openfoam/-/archive/OpenFOAM-v" - version - "/openfoam-OpenFOAM-v" - version - ".tar.gz")) - (sha256 - (base32 - "0i9039hfz9gvgymkdjhjvvn5500zha3cpdbpqrzfrfi8lbz10is2")) - (modules '((guix build utils))) - (snippet `(begin - (substitute* "etc/bashrc" - ;; set same version as guix package - (("^export WM_PROJECT_VERSION=.*$") - (string-append "export WM_PROJECT_VERSION=" - ,version "\n"))) - ;; patch shell paths - (substitute* (list "src/OSspecific/POSIX/POSIX.C" + (let* ((version "2306") + (name "openfoam-com") + (source (origin + (method url-fetch) + (uri (string-append "https://develop.openfoam.com" + "/Development/openfoam/-/archive/OpenFOAM-v" + version + "/openfoam-OpenFOAM-v" + version + ".tar.gz")) + (sha256 (base32 + "0zlkp48vygl2a5cyl0mfpj8dsb5bffviq96rg3kws1l6ni40v7jr")) + (modules '((guix build utils))) + (snippet `(begin + (substitute* "etc/bashrc" + ;; set same version as guix package + (("^export WM_PROJECT_VERSION=.*$") + (string-append "export WM_PROJECT_VERSION=" + ,version "\n"))) + ;; patch shell paths + (substitute* (list + "src/OSspecific/POSIX/POSIX.C" "wmake/src/Makefile" "wmake/makefiles/general" "wmake/makefiles/info") - (("/bin/sh") - "sh")))))) - (synopsis "Framework for numerical simulation of fluid flow (from openfoam.com)") - (home-page "https://www.openfoam.com"))) + (("/bin/sh") + "sh")))))) + (home-page "https://www.openfoam.com") + (synopsis + "Framework for numerical simulation of fluid flow (from openfoam.com)") + (template (openfoam-package source version name home-page synopsis))) + (package + (inherit template)))) (define-public open-simulation-interface (package