From patchwork Fri Jul 2 10:06:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30956 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 288F127BC81; Fri, 2 Jul 2021 11:16:43 +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 655F527BC78 for ; Fri, 2 Jul 2021 11:16:42 +0100 (BST) Received: from localhost ([::1]:52668 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lzGDx-00078x-GT for patchwork@mira.cbaines.net; Fri, 02 Jul 2021 06:16:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50674) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lzG6a-00072D-4H for guix-patches@gnu.org; Fri, 02 Jul 2021 06:09:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51141) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lzG6Z-0004I2-Sn for guix-patches@gnu.org; Fri, 02 Jul 2021 06:09:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lzG6Z-0008Ir-MY for guix-patches@gnu.org; Fri, 02 Jul 2021 06:09:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49327] [PATCH core-updates 001/128] gnu: admin: 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:03 +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.162522053431701 (code B ref 49327); Fri, 02 Jul 2021 10:09:03 +0000 Received: (at 49327) by debbugs.gnu.org; 2 Jul 2021 10:08:54 +0000 Received: from localhost ([127.0.0.1]:34377 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lzG6Q-0008F0-5j for submit@debbugs.gnu.org; Fri, 02 Jul 2021 06:08:54 -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 1lzG6F-0008Bv-Pr for 49327@debbugs.gnu.org; Fri, 02 Jul 2021 06:08:44 -0400 Received: from localhost.localdomain ([213.119.233.144]) by laurent.telenet-ops.be with bizsmtp id QA8h2500B37benp01A8iBW; Fri, 02 Jul 2021 12:08:42 +0200 From: Maxime Devos Date: Fri, 2 Jul 2021 12:06:07 +0200 Message-Id: <20210702100814.23249-1-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: References: MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1625220522; bh=G28+pVVzSCVLG0uDKhdAwL2GKxcyfA32WTOvBGjILSE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=cRfQl47tBwGHXknvgDt3hMNdTGOZ6zf5ICZAt7fRFRcOj39gn8ggNIe1v/10kPi1C X/BKEBhlVWExzbLm2+v3RsoY1GLTuMv9ihS8p7GzwisGLH+bYnnvg4LfRRadrJxQ2Z TpWBGRlaCF2b3spSau2rFPEN+Jn7eRVqVj7v7dJ2wAZ7S91ZnaaJbp50bz09/AH/ot VWgewBld1dNy44NZXeQAoHY9VLl4ZMQLxgbZLT9VBS+ongPp7RkKvUhVcOKiK2CgF5 ZV+OmQvVnmlM3xGaXUxNOnivokGlW0BJSt9BJIawPoGLvGwLVWm8djFDbOLs3bfsJe I6xT0i2zflhlQ== 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/admin.scm (isc-dhcp)[inputs]: Add 'bash-minimal'. (clusterssh)[inputs]: Likewise. (rename)[inputs]: Likewise. (wpa-supplicant-gui)[inputs]: Likewise. (nmap)[inputs]: Likewise. (dstat)[inputs]: Likewise. --- gnu/packages/admin.scm | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index f8afc3d374..d9dfe7ab59 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1278,7 +1278,8 @@ connection alive.") `(("perl" ,perl) ("file" ,file))) - (inputs `(("inetutils" ,inetutils) + (inputs `(("bash" ,bash-minimal) ; for wrap-program + ("inetutils" ,inetutils) ,@(if (hurd-target?) '() `(("net-tools" ,net-tools) ("iproute" ,iproute))) @@ -1458,7 +1459,8 @@ by bandwidth they use.") ("perl-test-trap" ,perl-test-trap) ("perltidy" ,perltidy))) (inputs - `(("perl-exception-class" ,perl-exception-class) + `(("bash" ,bash-minimal) ; for wrap-program + ("perl-exception-class" ,perl-exception-class) ("perl-sort-naturally" ,perl-sort-naturally) ("perl-tk" ,perl-tk) ("perl-try-tiny" ,perl-try-tiny) @@ -1503,6 +1505,8 @@ over ssh connections.") (,(string-append out "/lib/perl5/site_perl"))))) (find-files "." ".*"))) #t)))))) + (inputs + `(("bash" ,bash-minimal))) ; for wrap-program (native-inputs `(("perl-module-build" ,perl-module-build) ("perl-test-pod" ,perl-test-pod) @@ -1887,6 +1891,9 @@ command.") (inputs `(("qtbase" ,qtbase) ("qtsvg" ,qtsvg) ,@(package-inputs wpa-supplicant))) + (inputs + `(("bash" ,bash-minimal) ; for wrap-program + ,@(package-inputs wpa-supplicant))) (native-inputs ;; For icons. `(("imagemagick" ,imagemagick) @@ -2872,7 +2879,8 @@ done with the @code{auditctl} utility.") #t)))) (build-system gnu-build-system) (inputs - `(("openssl" ,openssl) + `(("bash" ,bash-minimal) ; for wrap-program + ("openssl" ,openssl) ("libpcap" ,libpcap) ("pcre" ,pcre) ("lua" ,lua) @@ -2972,7 +2980,8 @@ results (ndiff), and a packet generation and response analysis tool (nping).") `("GUIX_PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH")))) #t)))))) (inputs - `(("python" ,python-wrapper) + `(("bash" ,bash-minimal) ; for wrap-program + ("python" ,python-wrapper) ("python-six" ,python-six))) (synopsis "Versatile resource statistics tool") (description "Dstat is a versatile replacement for @command{vmstat},