From patchwork Fri Oct 1 14:21:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 33487 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 4A88D27BBE3; Fri, 1 Oct 2021 15:26:32 +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 0AE4927BBE1 for ; Fri, 1 Oct 2021 15:26:32 +0100 (BST) Received: from localhost ([::1]:43518 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mWJUd-00027j-2M for patchwork@mira.cbaines.net; Fri, 01 Oct 2021 10:26:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43990) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWJUC-00026s-1G for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45412) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mWJUB-0000UH-Pc for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mWJUB-0005gF-Js for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH core-updates v2 08/38] gnu: isc-dhcp: Don't use canonical-package. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 01 Oct 2021 14:26:03 +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.163309831221579 (code B ref 50905); Fri, 01 Oct 2021 14:26:03 +0000 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:25:12 +0000 Received: from localhost ([127.0.0.1]:56905 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJTM-0005bt-Lm for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:25:12 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:33358) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJQ4-0005Ti-Ls for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:21:51 -0400 Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMnL1; Fri, 01 Oct 2021 16:21:48 +0200 From: Maxime Devos Date: Fri, 1 Oct 2021 16:21:10 +0200 Message-Id: <20211001142140.17027-8-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=CGpXVEGPdOA07TT/1tOmXDHEByyTr0XyOyvkuGoF4BY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=EWdeVnE/vifIxCNpdt+mHEFQ1lUgF5NQ1DQ8kOmQGxADz4OdptKIUx9kCjMVsXyuh AmBArB+O5xw8LE36zVa57hV1Ap2FX6C3jpIewQIwmv8FSlrr/IEX1uRH4y1n6bI5ms uayOUxR8X4/W+BAH+DXuqGt10VOzFdW/zUvVgxBDPdcmWqyc0MfG7HKy7TTnsvYCoE l6RhGe3E3egf55CX5iCZhwgls0B7zN/9IQC+5RVUkhGV9rtk6bv5KiQO1DnHDj1fq2 DftHSyFWgy7bvY9o24/BE3nZRf0Lj0bR5ZR9nEDRa1OTXd7q2nU22bcguvOH24gffy cNfcW5yoQR6fA== 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 As I understand it, canonical-package is only for things that won't end up in the closure, so canonical-package shouldn't be used here. * gnu/packages/admin.scm (isc-dhcp)[inputs]{bash}: Remove 'canonical-package'. --- gnu/packages/admin.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index aad8586a71..c535baf1d6 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1318,7 +1318,7 @@ connection alive.") ;; TODO(core-updates): simply make this unconditional ,@(if (%current-target-system) ;; for wrap-program - `(("bash" ,(canonical-package bash-minimal))) + `(("bash" ,bash-minimal)) '()) ,@(if (hurd-target?) '() `(("net-tools" ,net-tools)