From patchwork Mon Jun 24 12:22:06 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: 14373 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 F3E7D17154; Mon, 24 Jun 2019 13:23:10 +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=ham 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 A47671714F for ; Mon, 24 Jun 2019 13:23:10 +0100 (BST) Received: from localhost ([::1]:50690 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hfO06-0002xe-1n for patchwork@mira.cbaines.net; Mon, 24 Jun 2019 08:23:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48566) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hfO01-0002tp-Mp for guix-patches@gnu.org; Mon, 24 Jun 2019 08:23:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hfNzz-0001O2-LE for guix-patches@gnu.org; Mon, 24 Jun 2019 08:23:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42183) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hfNzz-0001Mh-EQ for guix-patches@gnu.org; Mon, 24 Jun 2019 08:23:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hfNzz-0003nQ-8T for guix-patches@gnu.org; Mon, 24 Jun 2019 08:23:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36351] [PATCH 04/10] graph: Use 'derivation-input-derivation'. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 24 Jun 2019 12:23:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36351 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36351@debbugs.gnu.org Received: via spool by 36351-submit@debbugs.gnu.org id=B36351.156137895314460 (code B ref 36351); Mon, 24 Jun 2019 12:23:03 +0000 Received: (at 36351) by debbugs.gnu.org; 24 Jun 2019 12:22:33 +0000 Received: from localhost ([127.0.0.1]:55708 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hfNzU-0003l5-LS for submit@debbugs.gnu.org; Mon, 24 Jun 2019 08:22:32 -0400 Received: from eggs.gnu.org ([209.51.188.92]:42506) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hfNzS-0003k5-JU for 36351@debbugs.gnu.org; Mon, 24 Jun 2019 08:22:30 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:36234) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hfNzN-0000VA-F5; Mon, 24 Jun 2019 08:22:25 -0400 Received: from [2001:660:6102:320:e120:2c8f:8909:cdfe] (port=43566 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1hfNzM-0000Yc-Fw; Mon, 24 Jun 2019 08:22:25 -0400 From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Mon, 24 Jun 2019 14:22:06 +0200 Message-Id: <20190624122212.5932-4-ludo@gnu.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190624122212.5932-1-ludo@gnu.org> References: <20190624122212.5932-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/scripts/graph.scm (derivation-dependencies): Use 'derivation-input-derivation'. --- guix/scripts/graph.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/guix/scripts/graph.scm b/guix/scripts/graph.scm index 8fe81ad64b..2e14857f1e 100644 --- a/guix/scripts/graph.scm +++ b/guix/scripts/graph.scm @@ -254,8 +254,7 @@ GNU-BUILD-SYSTEM have zero dependencies." "Return the objects and store items corresponding to the dependencies of OBJ, a or store item." (if (derivation? obj) - (append (map (compose read-derivation-from-file derivation-input-path) - (derivation-inputs obj)) + (append (map derivation-input-derivation (derivation-inputs obj)) (derivation-sources obj)) '()))