From patchwork Fri Oct 1 14:21:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 33491 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 9914527BBE3; Fri, 1 Oct 2021 15:26:42 +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,RCVD_IN_MSPIKE_H2,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 5489027BBE1 for ; Fri, 1 Oct 2021 15:26:42 +0100 (BST) Received: from localhost ([::1]:44282 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mWJUn-0002iq-Ex for patchwork@mira.cbaines.net; Fri, 01 Oct 2021 10:26:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44012) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWJUF-0002AM-VT for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:12 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45419) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mWJUE-0000WZ-IW for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mWJUE-0005h5-FY for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH core-updates v2 10/38] gnu: isc-dhcp: Remove unnecessary shebang patching. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 01 Oct 2021 14:26:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50905 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Mathieu Othacehe Cc: Maxime Devos , 50905@debbugs.gnu.org Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.163309831421630 (code B ref 50905); Fri, 01 Oct 2021 14:26:06 +0000 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:25:14 +0000 Received: from localhost ([127.0.0.1]:56919 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJTO-0005ci-FP for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:25:14 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:33378) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJQ4-0005Tk-Tp for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:21:52 -0400 Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMoL8; Fri, 01 Oct 2021 16:21:48 +0200 From: Maxime Devos Date: Fri, 1 Oct 2021 16:21:12 +0200 Message-Id: <20211001142140.17027-10-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211001142140.17027-1-maximedevos@telenet.be> References: <20211001142140.17027-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098108; bh=UOgLmA0Q2Kcq7Zx/3nOGDBZyxl5ppcEHC40ZKHK3ldI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=VH2CqoYuAfFyCGUYFSM6sYVERsQhAKpcSe4MGS7XHEENTDiBU11HvMwVW2uoDRTuf OwgKcvQWCTW4Wn6NfOVpvkuZCT6kDsROQzohxFe2JIkF+jAT2CvCfXeAqKzgQkqoJF dEzDx5jc4WOc7C327uhymPwKYy7HnmKJILEJen+ZEhNG/GtNYNtNUNh2NdZ0SCZjou TPZrkYamcZmATS6LrCyzWP4kMj88gB/rmRES4wKcfu494utZqaPnzdA69nWhJk4DIz 7BY+TXsWPUYpwI+a00mKhmRsJ9CUq7XXu5bEOd+IgHfSIiGtk+GueHWFjhJ5Dxo+6i nivcDzDYN0yDg== 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 * gnu/packages/admin.scm (isc-dhcp)[arguments]<#:phases>{post-install}: Remove parts indicated by TODOs. --- gnu/packages/admin.scm | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 744692bb6c..57801200bd 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1267,11 +1267,7 @@ connection alive.") "--owner=root:0" "--group=root:0"))))) (add-after 'install 'post-install - ;; TODO(core-updates): native-inputs isn't required anymore. - (lambda* (#:key ,@(if (%current-target-system) - '(native-inputs) - '()) - inputs outputs #:allow-other-keys) + (lambda* (#:key inputs outputs #:allow-other-keys) ;; Install the dhclient script for GNU/Linux and make sure ;; if finds all the programs it needs. (let* ((out (assoc-ref outputs "out")) @@ -1295,19 +1291,6 @@ connection alive.") (string-append dir "/bin:" dir "/sbin")) (list inetutils net-tools coreutils sed)))) - ;; TODO(core-updates): should not be required anymore, - ;; once has been merged. - ,@(if (%current-target-system) - '((for-each - (lambda (file) - (substitute* file - (((assoc-ref native-inputs "bash")) - (assoc-ref inputs "bash")))) - (list (string-append libexec - "/dhclient-script") - (string-append libexec - "/.dhclient-script-real")))) - '()) #t)))))) (native-inputs