From patchwork Fri Jul 2 10:06:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30976 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 A65FD27BC81; Fri, 2 Jul 2021 11:18:21 +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 5802527BC78 for ; Fri, 2 Jul 2021 11:18:21 +0100 (BST) Received: from localhost ([::1]:56970 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lzGFY-0001gp-F7 for patchwork@mira.cbaines.net; Fri, 02 Jul 2021 06:18:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50816) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lzG6v-0007g9-2C for guix-patches@gnu.org; Fri, 02 Jul 2021 06:09:25 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51294) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lzG6u-0004Vu-R3 for guix-patches@gnu.org; Fri, 02 Jul 2021 06:09:24 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lzG6u-0008Q6-L4 for guix-patches@gnu.org; Fri, 02 Jul 2021 06:09:24 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49327] [PATCH core-updates 030/128] gnu: guile-xyz: 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:24 +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.162522055732214 (code B ref 49327); Fri, 02 Jul 2021 10:09:24 +0000 Received: (at 49327) by debbugs.gnu.org; 2 Jul 2021 10:09:17 +0000 Received: from localhost ([127.0.0.1]:34574 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lzG6n-0008NI-4Y for submit@debbugs.gnu.org; Fri, 02 Jul 2021 06:09:17 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:60348) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lzG6O-0008C3-5B for 49327@debbugs.gnu.org; Fri, 02 Jul 2021 06:08:52 -0400 Received: from localhost.localdomain ([213.119.233.144]) by laurent.telenet-ops.be with bizsmtp id QA8h2500B37benp01A8rDS; Fri, 02 Jul 2021 12:08:51 +0200 From: Maxime Devos Date: Fri, 2 Jul 2021 12:06:36 +0200 Message-Id: <20210702100814.23249-30-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=1625220531; bh=5lDLMNBd2JSkJ/eGfv83prCSWMZypUZ77p+vJ0nTTTI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=OFfd/GScjej26knH2u5mdEWN86CHttAhLzD253QIFe+23LpFHPSLg6hEs6ZuxgJNK byCWqkXvwiobKKuszrhQkk97K+MAChzG1JVBgQKgxwAOqoy/NyWY+31lvZJNYjAn/r J0aEjlyNuNXMx7X7XDHn+U9hrc9Lr+OdfiKjH3biE2+gGIo3b/rVw3ep5wQpMqpI+W Jdg7xDCa5tGaPaFdMW6bpUiW0Gjb4yQGl/Q9RPYHOkse9MqCzvipZiHwH2Wu60R1c9 k+lk8DTKnlhZW9IhfErzZ4sin1FDQPiFFHiwvYH+zT34K0+P3WKHa1geIj3OezNHfA WWUS2J+W9Lu4w== 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/guile-xyz.scm (artanis)[inputs]: Add 'bash-minimal'. (guile-dsv)[inputs]: Likewise. (guile-hall)[inputs]: Likewise. (python-on-guile)[inputs]: Likewise. (haunt)[inputs]: Likewise. (emacsy)[inputs]: Likewise. (nomad)[inputs]: Likewise. --- gnu/packages/guile-xyz.scm | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index e4164d2c47..211ac441c1 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -167,7 +167,8 @@ #t)))) (build-system gnu-build-system) (inputs - `(("guile" ,guile-2.2) + `(("bash" ,bash-minimal) ; for wrap-program + ("guile" ,guile-2.2) ("nss" ,nss))) ;; FIXME the bundled csv contains one more exported procedure ;; (sxml->csv-string) than guile-csv. The author is maintainer of both @@ -529,7 +530,8 @@ you send to a FIFO file.") ("automake" ,automake) ("pkg-config" ,pkg-config) ("texinfo" ,texinfo))) - (inputs `(("guile" ,guile-3.0))) + (inputs `(("bash" ,bash-minimal) ; for wrap-program + ("guile" ,guile-3.0))) (propagated-inputs `(("guile-lib" ,guile-lib))) (arguments `(#:modules (((guix build guile-build-system) @@ -1690,7 +1692,8 @@ above command-line parameters.") ("automake" ,automake) ("pkg-config" ,pkg-config) ("texinfo" ,texinfo))) - (inputs `(("guile" ,guile-3.0))) + (inputs `(("bash" ,bash-minimal) ; for wrap-program + ("guile" ,guile-3.0))) (propagated-inputs `(("guile-config" ,guile-config))) (synopsis "Guile project tooling") @@ -2492,9 +2495,10 @@ inspired by the SCSH regular expression system.") `(("pkg-config" ,pkg-config) ("texinfo" ,texinfo))) (inputs - ;; Depend on the latest Guile to avoid bytecode compatibility issues when - ;; using modules built against the latest version. - `(("guile" ,guile-3.0-latest))) + `(("bash" ,bash-minimal) ; for wrap-program + ;; Depend on the latest Guile to avoid bytecode compatibility issues + ;; when using modules built against the latest version. + ("guile" ,guile-3.0-latest))) (propagated-inputs `(("guile-reader" ,guile-reader) ("guile-commonmark" ,guile-commonmark))) @@ -2956,7 +2960,8 @@ serializing continuations or delimited continuations.") (,compiled-path))) #t)))))) (inputs - `(("guile" ,guile-3.0) + `(("bash" ,bash-minimal) ; for wrap-program + ("guile" ,guile-3.0) ("guile-persist" ,guile-persist) ("guile-readline" ,guile-readline) ("guile-stis-parser" ,guile-stis-parser))) @@ -3276,7 +3281,8 @@ API.") ("texinfo" ,texinfo) ("texlive" ,(texlive-updmap.cfg (list texlive-generic-epsf))))) (inputs - `(("dbus-glib" ,dbus-glib) + `(("bash" ,bash-minimal) ; for wrap-program + ("dbus-glib" ,dbus-glib) ("guile" ,guile-3.0) ("guile-lib" ,guile-lib) ("guile-readline" ,guile-readline) @@ -3429,7 +3435,8 @@ perform geometrical transforms on JPEG images.") ("gettext" ,gettext-minimal) ("perl" ,perl))) (inputs - `(;; Guile + `(("bash" ,bash-minimal) ; for wrap-program + ;; Guile ("guile" ,guile-2.2) ("guile-lib" ,guile2.2-lib) ("guile-readline" ,guile2.2-readline)