From patchwork Fri Jul 2 10:06:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30929 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 C8D1A27BC81; Fri, 2 Jul 2021 11:13:56 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7562F27BC78 for ; Fri, 2 Jul 2021 11:13:56 +0100 (BST) Received: from localhost ([::1]:43580 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lzGBH-0000rv-IW for patchwork@mira.cbaines.net; Fri, 02 Jul 2021 06:13:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50746) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lzG6q-0007bs-Ef for guix-patches@gnu.org; Fri, 02 Jul 2021 06:09:20 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51261) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lzG6n-0004Su-Ih for guix-patches@gnu.org; Fri, 02 Jul 2021 06:09:18 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lzG6n-0008NP-Bv for guix-patches@gnu.org; Fri, 02 Jul 2021 06:09:17 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49327] [PATCH core-updates 018/128] gnu: maths: Add 'bash' input for 'wrap-program'. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 02 Jul 2021 10:09:17 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49327 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49327@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 49327-submit@debbugs.gnu.org id=B49327.162522054531973 (code B ref 49327); Fri, 02 Jul 2021 10:09:17 +0000 Received: (at 49327) by debbugs.gnu.org; 2 Jul 2021 10:09:05 +0000 Received: from localhost ([127.0.0.1]:34464 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lzG6a-0008JP-T5 for submit@debbugs.gnu.org; Fri, 02 Jul 2021 06:09:05 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:60276) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lzG6K-0008Bv-B0 for 49327@debbugs.gnu.org; Fri, 02 Jul 2021 06:08:48 -0400 Received: from localhost.localdomain ([213.119.233.144]) by laurent.telenet-ops.be with bizsmtp id QA8h2500B37benp01A8nCg; Fri, 02 Jul 2021 12:08:48 +0200 From: Maxime Devos Date: Fri, 2 Jul 2021 12:06:24 +0200 Message-Id: <20210702100814.23249-18-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210702100814.23249-1-maximedevos@telenet.be> References: <20210702100814.23249-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1625220528; bh=V1X0d/QpdkBJ+q8GApDQPeslfZLh6Fpdm6vtdplUAb0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=IB6RCVVZJUPd8l5tYjB0iS2GPvcjEZ3K+Na3B6LyaVnwmGsItYXeVt8CMjscMwUxc /tdfDIXi7HvD836yMaCSJhq9zc6G6daupACqMIYZxTPOoJK7AbXrqOtN9QSJWGzdWK TibJK/itphQxNiCWmkNHjVUlgEclM4dQPLLLk99VriY/H7NChfOGfkY1TK9xWaQgry tegs3/9zYkPCDPj5aRoGwXc23lfc6kuuvdqUDLXIJ8IMV3OOSAAHIfkHNyDtinXcOI wtZ6nwuYD8WZZj5ycW9Z8Rv83MiURDfLzhotploHogfP5gCrUl1uRtJCyjQ3XWVZic iC1VKna1YPY1w== 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches It is required for cross-compilation. * gnu/packages/maths.scm (units)[inputs]: Add 'bash-minimal'. (vuesz)[inputs]: Likewise. (maxima)[inputs]: Likewise. (wxmaxima)[inputs]: Likewise. --- gnu/packages/maths.scm | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 4b33056d1e..39720deeb9 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -82,6 +82,7 @@ #:use-module (gnu packages audio) #:use-module (gnu packages autotools) #:use-module (gnu packages base) + #:use-module (gnu packages bash) #:use-module (gnu packages bison) #:use-module (gnu packages boost) #:use-module (gnu packages check) @@ -329,7 +330,8 @@ programming language.") "1bybhqs4yrly9myb5maz3kdmf8k4fhk2m1d5cbcryn40z6lq0gkc")))) (build-system gnu-build-system) (inputs - `(("readline" ,readline) + `(("bash" ,bash-minimal) ;for wrap-program + ("readline" ,readline) ("python" ,python-wrapper) ;for 'units_cur' script ("python-requests" ,python-requests))) (arguments @@ -2359,7 +2361,8 @@ ASCII text files using Gmsh's own scripting language.") ("qttools" ,qttools) ("python-sip" ,python-sip-4))) (inputs - `(("ghostscript" ,ghostscript) ;optional, for EPS/PS output + `(("bash" ,bash-minimal) ; for wrap-program + ("ghostscript" ,ghostscript) ;optional, for EPS/PS output ("python-dbus" ,python-dbus) ("python-h5py" ,python-h5py) ;optional, for HDF5 data ("python-pyqt" ,python-pyqt) @@ -3570,7 +3573,8 @@ to BMP, JPEG or PNG image formats.") (patches (search-patches "maxima-defsystem-mkdir.patch")))) (build-system gnu-build-system) (inputs - `(("gcl" ,gcl) + `(("bash" ,bash-minimal) ; for wrap-program + ("gcl" ,gcl) ("gnuplot" ,gnuplot) ;for plots ("sed" ,sed) ("tk" ,tk))) ;Tcl/Tk is used by 'xmaxima' @@ -3687,7 +3691,8 @@ point numbers.") (native-inputs `(("gettext" ,gettext-minimal))) (inputs - `(("wxwidgets" ,wxwidgets) + `(("bash" ,bash-minimal) ; for wrap-program + ("wxwidgets" ,wxwidgets) ("maxima" ,maxima) ;; Runtime support. ("adwaita-icon-theme" ,adwaita-icon-theme)