From patchwork Wed Jul 10 17:11:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 14563 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 58EFC171E2; Wed, 10 Jul 2019 18:13:16 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 27313171DD for ; Wed, 10 Jul 2019 18:13:16 +0100 (BST) Received: from localhost ([::1]:35538 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hlG9b-0007t3-OO for patchwork@mira.cbaines.net; Wed, 10 Jul 2019 13:13:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45427) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hlG9U-0007mo-9r for guix-patches@gnu.org; Wed, 10 Jul 2019 13:13:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hlG9S-0003Gk-OW for guix-patches@gnu.org; Wed, 10 Jul 2019 13:13:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:55965) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hlG9S-0003El-4E for guix-patches@gnu.org; Wed, 10 Jul 2019 13:13:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hlG9R-0001E0-UD for guix-patches@gnu.org; Wed, 10 Jul 2019 13:13:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36578] [PATCH 9/9] channels: Avoid use of 'derivation-input-path'. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Jul 2019 17:13:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36578 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36578@debbugs.gnu.org Received: via spool by 36578-submit@debbugs.gnu.org id=B36578.15627787404609 (code B ref 36578); Wed, 10 Jul 2019 17:13:05 +0000 Received: (at 36578) by debbugs.gnu.org; 10 Jul 2019 17:12:20 +0000 Received: from localhost ([127.0.0.1]:36546 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlG8h-0001CH-PM for submit@debbugs.gnu.org; Wed, 10 Jul 2019 13:12:19 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60930) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlG8g-0001Bw-LH for 36578@debbugs.gnu.org; Wed, 10 Jul 2019 13:12:18 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:47984) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hlG8b-0002G4-Ec; Wed, 10 Jul 2019 13:12:13 -0400 Received: from [81.18.188.212] (port=57592 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1hlG8X-0005OT-P1; Wed, 10 Jul 2019 13:12:11 -0400 From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Wed, 10 Jul 2019 19:11:28 +0200 Message-Id: <20190710171128.21568-9-ludo@gnu.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190710171128.21568-1-ludo@gnu.org> References: <20190710171128.21568-1-ludo@gnu.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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 * guix/channels.scm (old-style-guix?): Use 'derivation-name' rather than 'derivation-input-path'. --- guix/channels.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/guix/channels.scm b/guix/channels.scm index e6bb9b891b..a8c8f43276 100644 --- a/guix/channels.scm +++ b/guix/channels.scm @@ -424,8 +424,9 @@ derivation." ;; "old style" (before commit 8a0d9bc8a3f153159d9e239a151c0fa98f1e12d8, ;; dated May 30, 2018) did not depend on "guix-command.drv". (not (find (lambda (input) - (string-suffix? "-guix-command.drv" - (derivation-input-path input))) + (string=? "guix-command" + (derivation-name + (derivation-input-derivation input)))) (derivation-inputs drv)))) (define (channel-instances->manifest instances)