From patchwork Fri Jul 2 10:06:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30981 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 3D57627BC81; Fri, 2 Jul 2021 11:18:53 +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 EC2AD27BC78 for ; Fri, 2 Jul 2021 11:18:52 +0100 (BST) Received: from localhost ([::1]:58294 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lzGG3-0002bW-VD for patchwork@mira.cbaines.net; Fri, 02 Jul 2021 06:18:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50862) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lzG72-0007uC-H4 for guix-patches@gnu.org; Fri, 02 Jul 2021 06:09:32 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51336) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lzG72-0004cd-7H for guix-patches@gnu.org; Fri, 02 Jul 2021 06:09:32 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lzG72-0008TK-3g for guix-patches@gnu.org; Fri, 02 Jul 2021 06:09:32 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49327] [PATCH core-updates 043/128] gnu: web: 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:32 +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.162522056532403 (code B ref 49327); Fri, 02 Jul 2021 10:09:32 +0000 Received: (at 49327) by debbugs.gnu.org; 2 Jul 2021 10:09:25 +0000 Received: from localhost ([127.0.0.1]:34611 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lzG6v-0008QM-55 for submit@debbugs.gnu.org; Fri, 02 Jul 2021 06:09:25 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:60298) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lzG6S-0008By-Bp for 49327@debbugs.gnu.org; Fri, 02 Jul 2021 06:08:57 -0400 Received: from localhost.localdomain ([213.119.233.144]) by laurent.telenet-ops.be with bizsmtp id QA8h2500B37benp01A8vEL; Fri, 02 Jul 2021 12:08:56 +0200 From: Maxime Devos Date: Fri, 2 Jul 2021 12:06:49 +0200 Message-Id: <20210702100814.23249-43-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=1625220536; bh=fBw9mDS+U+rWt+MfUIly6JjWi556+TyI4z16JUnvc0E=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=YJm7P7vnfPXTjN9vPaLO6YXQ3JD6Qcv0Gk321mvwI1RxykQ6ql18eHbjJT3yG5tF5 N1aTN32gE4RhHhcCGCSVbXky4NZl4vEDakA5aY0oERWQGOgKnb6k6Pjh9qg7eOopu5 j5Mi9U8r5UZGM+mEMuGlJ11ZtwIHRfaysKicuGsGFwE5dsaUZ+kIcBwb/eXDte/xeL 3JKMDRH7zHQxAfb+Xr9QtCqVyTF3wAiTNXCxobj4MxZ+m1Vi52EsNGfLyhmU05xFEq 2gOtGkWai9fYrpfYqzNQbiNvhD/q0Mq/h9Zy645yy5DW8N7CT6rW9l1CBd/VKgKC5d 2asy6q6GhBzlA== 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/web.scm (krona-tools)[inputs]: Add 'bash-minimal'. (guix-data-service)[inputs]: Likewise. (ikiwiki)[inputs]: Likewise. (varnish)[inputs]: Likewise. (hiawatha)[inputs]: Likewise. (hpcguix-web)[inputs]: Likewise. (kiwix-desktop)[inputs]: Likewise. --- gnu/packages/web.scm | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 98a3ce5983..b846fca2ed 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -95,6 +95,7 @@ #:use-module (gnu packages apr) #:use-module (gnu packages autotools) #:use-module (gnu packages base) + #:use-module (gnu packages bash) #:use-module (gnu packages bison) #:use-module (gnu packages bittorrent) #:use-module (gnu packages boost) @@ -1284,7 +1285,8 @@ efficiently. It gives the application developer no more than 4 methods.") (invoke (string-append (assoc-ref outputs "out") "/bin/ktImportText") "ec.tsv"))))))) (inputs - `(("curl" ,curl) + `(("bash" ,bash-minimal) ; for wrap-program + ("curl" ,curl) ("make" ,gnu-make) ("perl" ,perl))) (home-page "https://github.com/marbl/Krona/wiki") @@ -4841,7 +4843,8 @@ CDF, Atom 0.3, and Atom 1.0 feeds.") #t))) (delete 'strip)))) ; As the .go files aren't compatible (inputs - `(("guix" ,guix) + `(("bash" ,bash-minimal) ; for wrap-program + ("guix" ,guix) ("guile-fibers" ,guile-fibers) ("guile-json" ,guile-json-4) ("guile-email" ,guile-email) @@ -5277,7 +5280,8 @@ NetSurf project.") ("cvs" ,cvs) ("mercurial" ,mercurial))) (inputs - `(("python" ,python-wrapper) + `(("bash" ,bash-minimal) ; for wrap-program + ("python" ,python-wrapper) ("perl-authen-passphrase" ,perl-authen-passphrase) ("perl-cgi-simple" ,perl-cgi-simple) ("perl-db-file" ,perl-db-file) @@ -6052,7 +6056,8 @@ deployments.") ("python-sphinx" ,python-sphinx) ("rst2man" ,python-docutils))) (inputs - `(("jemalloc" ,jemalloc) + `(("bash" ,bash-minimal) ; for wrap-program + ("jemalloc" ,jemalloc) ("ncurses" ,ncurses) ("pcre" ,pcre) ("python" ,python-wrapper) @@ -6230,7 +6235,8 @@ functions of Tidy.") `("PATH" ":" prefix (,mbed))))))))) (inputs ;; TODO: package "hiawatha-monitor", an optional dependency of "hiawatha". - `(("libxslt" ,libxslt) + `(("bash" ,bash-minimal) ; for wrap-program + ("libxslt" ,libxslt) ("libxml2" ,libxml2) ("mbedtls-apache" ,mbedtls-for-hiawatha) ("nghttp2" ,nghttp2 "lib") @@ -7761,7 +7767,8 @@ compressed JSON header blocks. ("uglify-js" ,uglify-js) ("pkg-config" ,pkg-config))) (inputs - `(("guile" ,@(assoc-ref (package-native-inputs guix) "guile")) + `(("bash" ,bash-minimal) ; for wrap-program + ("guile" ,@(assoc-ref (package-native-inputs guix) "guile")) ("guix" ,guix))) (propagated-inputs `(("guile" ,@(assoc-ref (package-native-inputs guix) "guile")) @@ -8136,7 +8143,8 @@ It contains the code shared by all Kiwix ports.") `("QTWEBENGINEPROCESS_PATH" = (,qt-process-path))) #t)))))) (inputs - `(("curl" ,curl) + `(("bash" ,bash-minimal) ; for wrap-program + ("curl" ,curl) ("icu4c" ,icu4c) ("kiwix-lib" ,kiwix-lib) ("libmicrohttpd" ,libmicrohttpd)