[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#36351] [PATCH 10/10] ui: 'show-derivation-outputs' accepts <derivat
From: |
Ludovic Courtès |
Subject: |
[bug#36351] [PATCH 10/10] ui: 'show-derivation-outputs' accepts <derivation-input> records. |
Date: |
Mon, 24 Jun 2019 14:22:12 +0200 |
* guix/ui.scm (show-derivation-outputs): Handle <derivation-input>
records.
---
guix/ui.scm | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/guix/ui.scm b/guix/ui.scm
index bdcae34ee2..b6985adf23 100644
--- a/guix/ui.scm
+++ b/guix/ui.scm
@@ -773,12 +773,19 @@ error."
str))))
(define (show-derivation-outputs derivation)
- "Show the output file names of DERIVATION."
- (format #t "~{~a~%~}"
- (map (match-lambda
- ((out-name . out)
- (derivation->output-path derivation out-name)))
- (derivation-outputs derivation))))
+ "Show the output file names of DERIVATION, which can be a derivation or a
+derivation input."
+ (define (show-outputs derivation outputs)
+ (format #t "~{~a~%~}"
+ (map (cut derivation->output-path derivation <>)
+ outputs)))
+
+ (match derivation
+ ((? derivation?)
+ (show-outputs derivation (derivation-output-names derivation)))
+ ((? derivation-input? input)
+ (show-outputs (derivation-input-derivation input)
+ (derivation-input-sub-derivations input)))))
(define* (check-available-space need
#:optional (directory (%store-prefix)))
--
2.22.0
- [bug#36351] [PATCH 00/10] Add 'derivation-build-plan', improve (guix derivations), Ludovic Courtès, 2019/06/24
- [bug#36351] [PATCH 01/10] derivations: Add 'derivation-input'., Ludovic Courtès, 2019/06/24
- [bug#36351] [PATCH 03/10] ui: 'show-what-to-build' uses 'derivation-build-plan'., Ludovic Courtès, 2019/06/24
- [bug#36351] [PATCH 04/10] graph: Use 'derivation-input-derivation'., Ludovic Courtès, 2019/06/24
- [bug#36351] [PATCH 06/10] derivations: 'derivation' preserves pointer equality., Ludovic Courtès, 2019/06/24
- [bug#36351] [PATCH 07/10] derivations: 'build-derivations' can be passed derivation inputs., Ludovic Courtès, 2019/06/24
- [bug#36351] [PATCH 02/10] derivations: Rewrite and replace 'derivations-prerequisites-to-build'., Ludovic Courtès, 2019/06/24
- [bug#36351] [PATCH 10/10] ui: 'show-derivation-outputs' accepts <derivation-input> records.,
Ludovic Courtès <=
- [bug#36351] [PATCH 08/10] packages: 'specification->package+output' distinguishes "no output specified"., Ludovic Courtès, 2019/06/24
- [bug#36351] [PATCH 09/10] ui: 'show-what-to-build' accepts derivation inputs., Ludovic Courtès, 2019/06/24
- [bug#36351] [PATCH 05/10] derivations: <derivation-input> now aggregates a <derivation>., Ludovic Courtès, 2019/06/24
- bug#36351: [PATCH 00/10] Add 'derivation-build-plan', improve (guix derivations), Ludovic Courtès, 2019/06/27