From patchwork Wed Jul 10 17:11:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 14561 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 F2745171E2; Wed, 10 Jul 2019 18:13:12 +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,URIBL_BLOCKED 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 66D37171E1 for ; Wed, 10 Jul 2019 18:13:12 +0100 (BST) Received: from localhost ([::1]:35534 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hlG9Y-0007nB-2Y for patchwork@mira.cbaines.net; Wed, 10 Jul 2019 13:13:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45364) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hlG9S-0007mc-My for guix-patches@gnu.org; Wed, 10 Jul 2019 13:13:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hlG9Q-0003AY-Fy for guix-patches@gnu.org; Wed, 10 Jul 2019 13:13:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:55959) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hlG9P-00038R-5Y for guix-patches@gnu.org; Wed, 10 Jul 2019 13:13:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hlG9P-0001DI-0U for guix-patches@gnu.org; Wed, 10 Jul 2019 13:13:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36578] [PATCH 3/9] gnu: guile-bootstrap: Use the new 'derivation' calling convention. 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:02 +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.15627787244517 (code B ref 36578); Wed, 10 Jul 2019 17:13:02 +0000 Received: (at 36578) by debbugs.gnu.org; 10 Jul 2019 17:12:04 +0000 Received: from localhost ([127.0.0.1]:36528 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlG8R-0001Ah-M9 for submit@debbugs.gnu.org; Wed, 10 Jul 2019 13:12:03 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60799) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlG8P-00019i-R4 for 36578@debbugs.gnu.org; Wed, 10 Jul 2019 13:12:02 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:47971) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hlG8K-0001xN-OZ; Wed, 10 Jul 2019 13:11:56 -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 1hlG8K-0005OT-9M; Wed, 10 Jul 2019 13:11:56 -0400 From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Wed, 10 Jul 2019 19:11:22 +0200 Message-Id: <20190710171128.21568-3-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 * gnu/packages/bootstrap.scm (raw-build): In 'derivation' call, distinguish #:inputs from #:sources, passing a list of as #:inputs. --- gnu/packages/bootstrap.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index e8b2120551..5030b815b9 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès ;;; Copyright © 2014, 2015, 2018 Mark H Weaver ;;; Copyright © 2017 Efraim Flashner ;;; @@ -29,7 +29,7 @@ #:use-module ((guix store) #:select (run-with-store add-to-store add-text-to-store)) #:use-module ((guix derivations) - #:select (derivation derivation->output-path)) + #:select (derivation derivation-input derivation->output-path)) #:use-module ((guix utils) #:select (gnu-triplet->nix-system)) #:use-module (guix memoization) #:use-module (srfi srfi-1) @@ -312,7 +312,8 @@ $out/bin/guile --version~%" (derivation store name bash `(,builder) #:system system - #:inputs `((,bash) (,builder) (,guile)) + #:inputs (list (derivation-input guile)) + #:sources (list bash builder) #:env-vars `(("GUILE_TARBALL" . ,(derivation->output-path guile))))))