pull: Pass #:use-substitutes? to 'show-what-to-build'.

Fixes <https://bugs.gnu.org/36509>.
Reported by Robert Vollmert <rob@vllmrt.net>.

* guix/scripts/pull.scm (build-and-install): Add #:use-substitutes?
parameter and pass it to UPDATE-PROFILE.
(guix-pull): Pass #:use-substitutes? to 'build-and-install'.
This commit is contained in:
Ludovic Courtès 2019-07-17 21:28:54 +02:00
parent 67fb53c0d8
commit 9b9b753529
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 4 additions and 1 deletions

View File

@ -193,7 +193,7 @@ newest generation of PROFILE."
(_ #t))) (_ #t)))
(define* (build-and-install instances profile (define* (build-and-install instances profile
#:key verbose? dry-run?) #:key use-substitutes? verbose? dry-run?)
"Build the tool from SOURCE, and install it in PROFILE. When DRY-RUN? is "Build the tool from SOURCE, and install it in PROFILE. When DRY-RUN? is
true, display what would be built without actually building it." true, display what would be built without actually building it."
(define update-profile (define update-profile
@ -206,6 +206,7 @@ true, display what would be built without actually building it."
(mlet %store-monad ((manifest (channel-instances->manifest instances))) (mlet %store-monad ((manifest (channel-instances->manifest instances)))
(mbegin %store-monad (mbegin %store-monad
(update-profile profile manifest (update-profile profile manifest
#:use-substitutes? use-substitutes?
#:hooks %channel-profile-hooks #:hooks %channel-profile-hooks
#:dry-run? dry-run?) #:dry-run? dry-run?)
(munless dry-run? (munless dry-run?
@ -600,6 +601,8 @@ Use '~/.config/guix/channels.scm' instead."))
(build-and-install instances profile (build-and-install instances profile
#:dry-run? #:dry-run?
(assoc-ref opts 'dry-run?) (assoc-ref opts 'dry-run?)
#:use-substitutes?
(assoc-ref opts 'substitutes?)
#:verbose? #:verbose?
(assoc-ref opts 'verbose?)))))))))))))) (assoc-ref opts 'verbose?))))))))))))))