From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:48569) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hfO01-0002tv-QK for guix-patches@gnu.org; Mon, 24 Jun 2019 08:23:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hfNzz-0001Ni-Jn for guix-patches@gnu.org; Mon, 24 Jun 2019 08:23:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42180) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hfNzx-0001IS-W8 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 1hfNzx-0003n1-OX for guix-patches@gnu.org; Mon, 24 Jun 2019 08:23:01 -0400 Subject: [bug#36351] [PATCH 01/10] derivations: Add 'derivation-input'. References: <20190624121857.5818-1-ludo@gnu.org> In-Reply-To: <20190624121857.5818-1-ludo@gnu.org> Resent-Message-ID: From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Mon, 24 Jun 2019 14:22:03 +0200 Message-Id: <20190624122212.5932-1-ludo@gnu.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 36351@debbugs.gnu.org * guix/derivations.scm (derivation-input): New procedure. * tests/grafts.scm (make-derivation-input): Remove. ("graft-derivation, unused outputs not depended on"): Use 'derivation-input'. --- guix/derivations.scm | 8 ++++++++ tests/grafts.scm | 16 ++++------------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/guix/derivations.scm b/guix/derivations.scm index 8145d51143..4df7b06181 100644 --- a/guix/derivations.scm +++ b/guix/derivations.scm @@ -157,6 +157,14 @@ "Return the object INPUT refers to." (read-derivation-from-file (derivation-input-path input))) +(define* (derivation-input drv #:optional + (outputs (derivation-output-names drv))) + "Return a for the OUTPUTS of DRV." + ;; This is a public interface meant to be more convenient than + ;; 'make-derivation-input' and giving us more control. + (make-derivation-input (derivation-file-name drv) + outputs)) + (set-record-type-printer! (lambda (drv port) (format port "# ~a ~a>" diff --git a/tests/grafts.scm b/tests/grafts.scm index f85f3c6913..6fd3d5e171 100644 --- a/tests/grafts.scm +++ b/tests/grafts.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014, 2015, 2016, 2017, 2018 Ludovic Courtès +;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -45,9 +45,6 @@ (define %mkdir (bootstrap-binary "mkdir")) -(define make-derivation-input - (@@ (guix derivations) make-derivation-input)) - (test-begin "grafts") @@ -356,16 +353,11 @@ (p1r-inputs (filter (match-input p1r) inputs)) (p2-inputs (filter (match-input p2) inputs))) (and (equal? p1-inputs - (list (make-derivation-input (derivation-file-name p1) - '("one")))) + (list (derivation-input p1 '("one")))) (equal? p1r-inputs - (list - (make-derivation-input (derivation-file-name p1r) - '("ONE")))) + (list (derivation-input p1r '("ONE")))) (equal? p2-inputs - (list - (make-derivation-input (derivation-file-name p2) - '("aaa")))) + (list (derivation-input p2 '("aaa")))) (derivation-output-names p2g)))))) (test-assert "graft-derivation, renaming" ; -- 2.22.0