[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
13/15: ui: 'show-what-to-build' accepts derivation inputs.
From: |
guix-commits |
Subject: |
13/15: ui: 'show-what-to-build' accepts derivation inputs. |
Date: |
Thu, 27 Jun 2019 05:15:46 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit d38d4ffa10d74e361e15e18d04898eb5af3fb2eb
Author: Ludovic Courtès <address@hidden>
Date: Sun Jun 23 18:35:26 2019 +0200
ui: 'show-what-to-build' accepts derivation inputs.
This is a followup to f8a9f99cd602ce1dc5307cb0c21ae718ad8796bb.
* guix/ui.scm (show-what-to-build)[inputs]: New variables.
[substitutable-info]: Build the derivation list from INPUTS.
Pass INPUTS to 'derivation-build-plan'.
---
guix/ui.scm | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/guix/ui.scm b/guix/ui.scm
index 9748471..630afa4 100644
--- a/guix/ui.scm
+++ b/guix/ui.scm
@@ -812,20 +812,28 @@ warning."
#:key dry-run? (use-substitutes? #t)
(mode (build-mode normal)))
"Show what will or would (depending on DRY-RUN?) be built in realizing the
-derivations listed in DRV using MODE, a 'build-mode' value. Return #t if
-there's something to build, #f otherwise. When USE-SUBSTITUTES?, check and
-report what is prerequisites are available for download."
+derivations listed in DRV using MODE, a 'build-mode' value. The elements of
+DRV can be either derivations or derivation inputs.
+
+Return #t if there's something to build, #f otherwise. When USE-SUBSTITUTES?,
+check and report what is prerequisites are available for download."
+ (define inputs
+ (map (match-lambda
+ ((? derivation? drv) (derivation-input drv))
+ ((? derivation-input? input) input))
+ drv))
+
(define substitutable-info
;; Call 'substitutation-oracle' upfront so we don't end up launching the
;; substituter many times. This makes a big difference, especially when
;; DRV is a long list as is the case with 'guix environment'.
(if use-substitutes?
- (substitution-oracle store drv #:mode mode)
+ (substitution-oracle store (map derivation-input-derivation inputs)
+ #:mode mode)
(const #f)))
(let*-values (((build download)
- (derivation-build-plan store
- (map derivation-input drv)
+ (derivation-build-plan store inputs
#:mode mode
#:substitutable-info
substitutable-info))
- branch master updated (b09e496 -> c30d117), guix-commits, 2019/06/27
- 01/15: accounts: Use 'fsync' instead of 'fdatasync'., guix-commits, 2019/06/27
- 03/15: syscalls: Add 'terminal-rows'., guix-commits, 2019/06/27
- 06/15: derivations: Rewrite and replace 'derivations-prerequisites-to-build'., guix-commits, 2019/06/27
- 04/15: ui: Add 'display-search-results' and use it., guix-commits, 2019/06/27
- 02/15: ui: 'relevance' considers regexps connected with a logical and., guix-commits, 2019/06/27
- 11/15: derivations: 'build-derivations' can be passed derivation inputs., guix-commits, 2019/06/27
- 05/15: derivations: Add 'derivation-input'., guix-commits, 2019/06/27
- 15/15: tests: Avoid TCP port collision between lint.scm and guix-daemon.sh., guix-commits, 2019/06/27
- 13/15: ui: 'show-what-to-build' accepts derivation inputs.,
guix-commits <=
- 09/15: derivations: <derivation-input> now aggregates a <derivation>., guix-commits, 2019/06/27
- 10/15: derivations: 'derivation' preserves pointer equality., guix-commits, 2019/06/27
- 08/15: graph: Use 'derivation-input-derivation'., guix-commits, 2019/06/27
- 07/15: ui: 'show-what-to-build' uses 'derivation-build-plan'., guix-commits, 2019/06/27
- 14/15: ui: 'show-derivation-outputs' accepts <derivation-input> records., guix-commits, 2019/06/27
- 12/15: packages: 'specification->package+output' distinguishes "no output specified"., guix-commits, 2019/06/27