guix package, pull: Use 'with-build-handler'.
* guix/scripts/package.scm (build-and-use-profile): Remove #:dry-run? and #:use-substitutes?. Remove call to 'show-what-to-build' and 'dry-run?' special case. (process-actions): Adjust accordingly. (guix-package*): Wrap 'parameterize' in 'with-build-handler'. * guix/scripts/pull.scm (build-and-install): Remove #:use-substitutes? and #:dry-run? and adjust 'update-profile' call accordingly. Remove 'dry-run?' conditional. (guix-pull): Wrap body in 'with-build-handler'.master
Ludovic Courtès
parent
5f5e9a5cd6
commit
65ffb9388c
|
|
@ -132,8 +132,7 @@ denote ranges as interpreted by 'matching-generations'."
|
|||
#:key
|
||||
(hooks %default-profile-hooks)
|
||||
allow-collisions?
|
||||
bootstrap? use-substitutes?
|
||||
dry-run?)
|
||||
bootstrap?)
|
||||
"Build a new generation of PROFILE, a file name, using the packages
|
||||
specified in MANIFEST, a manifest object. When ALLOW-COLLISIONS? is true,
|
||||
do not treat collisions in MANIFEST as an error. HOOKS is a list of \"profile
|
||||
|
|
@ -144,12 +143,8 @@ hooks\" run when building the profile."
|
|||
#:hooks (if bootstrap? '() hooks)
|
||||
#:locales? (not bootstrap?))))
|
||||
(prof (derivation->output-path prof-drv)))
|
||||
(show-what-to-build store (list prof-drv)
|
||||
#:use-substitutes? use-substitutes?
|
||||
#:dry-run? dry-run?)
|
||||
|
||||
(cond
|
||||
(dry-run? #t)
|
||||
((and (file-exists? profile)
|
||||
(and=> (readlink* profile) (cut string=? prof <>)))
|
||||
(format (current-error-port) (G_ "nothing to be done~%")))
|
||||
|
|
@ -920,9 +915,7 @@ processed, #f otherwise."
|
|||
#:dry-run? dry-run?)
|
||||
(build-and-use-profile store profile new
|
||||
#:allow-collisions? allow-collisions?
|
||||
#:bootstrap? bootstrap?
|
||||
#:use-substitutes? substitutes?
|
||||
#:dry-run? dry-run?)))))
|
||||
#:bootstrap? bootstrap?)))))
|
||||
|
||||
|
||||
;;;
|
||||
|
|
@ -951,10 +944,14 @@ option processing with 'parse-command-line'."
|
|||
(%graft? (assoc-ref opts 'graft?)))
|
||||
(with-status-verbosity (assoc-ref opts 'verbosity)
|
||||
(set-build-options-from-command-line (%store) opts)
|
||||
(parameterize ((%guile-for-build
|
||||
(package-derivation
|
||||
(%store)
|
||||
(if (assoc-ref opts 'bootstrap?)
|
||||
%bootstrap-guile
|
||||
(canonical-package guile-2.2)))))
|
||||
(process-actions (%store) opts)))))))
|
||||
(with-build-handler (build-notifier #:use-substitutes?
|
||||
(assoc-ref opts 'substitutes?)
|
||||
#:dry-run?
|
||||
(assoc-ref opts 'dry-run?))
|
||||
(parameterize ((%guile-for-build
|
||||
(package-derivation
|
||||
(%store)
|
||||
(if (assoc-ref opts 'bootstrap?)
|
||||
%bootstrap-guile
|
||||
(canonical-package guile-2.2)))))
|
||||
(process-actions (%store) opts))))))))
|
||||
|
|
|
|||
|
|
@ -389,8 +389,7 @@ previous generation. Return true if there are news to display."
|
|||
|
||||
(display-channel-news profile))
|
||||
|
||||
(define* (build-and-install instances profile
|
||||
#:key use-substitutes? dry-run?)
|
||||
(define* (build-and-install instances profile)
|
||||
"Build the tool from SOURCE, and install it in PROFILE. When DRY-RUN? is
|
||||
true, display what would be built without actually building it."
|
||||
(define update-profile
|
||||
|
|
@ -403,29 +402,27 @@ true, display what would be built without actually building it."
|
|||
(mlet %store-monad ((manifest (channel-instances->manifest instances)))
|
||||
(mbegin %store-monad
|
||||
(update-profile profile manifest
|
||||
#:use-substitutes? use-substitutes?
|
||||
#:hooks %channel-profile-hooks
|
||||
#:dry-run? dry-run?)
|
||||
(munless dry-run?
|
||||
(return (newline))
|
||||
(return
|
||||
(let ((more? (list (display-profile-news profile #:concise? #t)
|
||||
(display-channel-news-headlines profile))))
|
||||
(when (any ->bool more?)
|
||||
(display-hint
|
||||
(G_ "Run @command{guix pull --news} to read all the news.")))))
|
||||
(if guix-command
|
||||
(let ((new (map (cut string-append <> "/bin/guix")
|
||||
(list (user-friendly-profile profile)
|
||||
profile))))
|
||||
;; Is the 'guix' command previously in $PATH the same as the new
|
||||
;; one? If the answer is "no", then suggest 'hash guix'.
|
||||
(unless (member guix-command new)
|
||||
(display-hint (format #f (G_ "After setting @code{PATH}, run
|
||||
#:hooks %channel-profile-hooks)
|
||||
|
||||
(return
|
||||
(let ((more? (list (display-profile-news profile #:concise? #t)
|
||||
(display-channel-news-headlines profile))))
|
||||
(newline)
|
||||
(when (any ->bool more?)
|
||||
(display-hint
|
||||
(G_ "Run @command{guix pull --news} to read all the news.")))))
|
||||
(if guix-command
|
||||
(let ((new (map (cut string-append <> "/bin/guix")
|
||||
(list (user-friendly-profile profile)
|
||||
profile))))
|
||||
;; Is the 'guix' command previously in $PATH the same as the new
|
||||
;; one? If the answer is "no", then suggest 'hash guix'.
|
||||
(unless (member guix-command new)
|
||||
(display-hint (format #f (G_ "After setting @code{PATH}, run
|
||||
@command{hash guix} to make sure your shell refers to @file{~a}.")
|
||||
(first new))))
|
||||
(return #f))
|
||||
(return #f))))))
|
||||
(first new))))
|
||||
(return #f))
|
||||
(return #f)))))
|
||||
|
||||
(define (honor-lets-encrypt-certificates! store)
|
||||
"Tell Guile-Git to use the Let's Encrypt certificates."
|
||||
|
|
@ -760,10 +757,12 @@ Use '~/.config/guix/channels.scm' instead."))
|
|||
(define (guix-pull . args)
|
||||
(with-error-handling
|
||||
(with-git-error-handling
|
||||
(let* ((opts (parse-command-line args %options
|
||||
(list %default-options)))
|
||||
(channels (channel-list opts))
|
||||
(profile (or (assoc-ref opts 'profile) %current-profile)))
|
||||
(let* ((opts (parse-command-line args %options
|
||||
(list %default-options)))
|
||||
(substitutes? (assoc-ref opts 'substitutes?))
|
||||
(dry-run? (assoc-ref opts 'dry-run?))
|
||||
(channels (channel-list opts))
|
||||
(profile (or (assoc-ref opts 'profile) %current-profile)))
|
||||
(cond ((assoc-ref opts 'query)
|
||||
(process-query opts profile))
|
||||
((assoc-ref opts 'generation)
|
||||
|
|
@ -773,38 +772,37 @@ Use '~/.config/guix/channels.scm' instead."))
|
|||
(with-status-verbosity (assoc-ref opts 'verbosity)
|
||||
(parameterize ((%current-system (assoc-ref opts 'system))
|
||||
(%graft? (assoc-ref opts 'graft?)))
|
||||
(set-build-options-from-command-line store opts)
|
||||
(ensure-default-profile)
|
||||
(honor-x509-certificates store)
|
||||
(with-build-handler (build-notifier #:use-substitutes?
|
||||
substitutes?
|
||||
#:dry-run? dry-run?)
|
||||
(set-build-options-from-command-line store opts)
|
||||
(ensure-default-profile)
|
||||
(honor-x509-certificates store)
|
||||
|
||||
(let ((instances (latest-channel-instances store channels)))
|
||||
(format (current-error-port)
|
||||
(N_ "Building from this channel:~%"
|
||||
"Building from these channels:~%"
|
||||
(length instances)))
|
||||
(for-each (lambda (instance)
|
||||
(let ((channel
|
||||
(channel-instance-channel instance)))
|
||||
(format (current-error-port)
|
||||
" ~10a~a\t~a~%"
|
||||
(channel-name channel)
|
||||
(channel-url channel)
|
||||
(string-take
|
||||
(channel-instance-commit instance)
|
||||
7))))
|
||||
instances)
|
||||
(parameterize ((%guile-for-build
|
||||
(package-derivation
|
||||
store
|
||||
(if (assoc-ref opts 'bootstrap?)
|
||||
%bootstrap-guile
|
||||
(canonical-package guile-2.2)))))
|
||||
(with-profile-lock profile
|
||||
(run-with-store store
|
||||
(build-and-install instances profile
|
||||
#:dry-run?
|
||||
(assoc-ref opts 'dry-run?)
|
||||
#:use-substitutes?
|
||||
(assoc-ref opts 'substitutes?)))))))))))))))
|
||||
(let ((instances (latest-channel-instances store channels)))
|
||||
(format (current-error-port)
|
||||
(N_ "Building from this channel:~%"
|
||||
"Building from these channels:~%"
|
||||
(length instances)))
|
||||
(for-each (lambda (instance)
|
||||
(let ((channel
|
||||
(channel-instance-channel instance)))
|
||||
(format (current-error-port)
|
||||
" ~10a~a\t~a~%"
|
||||
(channel-name channel)
|
||||
(channel-url channel)
|
||||
(string-take
|
||||
(channel-instance-commit instance)
|
||||
7))))
|
||||
instances)
|
||||
(parameterize ((%guile-for-build
|
||||
(package-derivation
|
||||
store
|
||||
(if (assoc-ref opts 'bootstrap?)
|
||||
%bootstrap-guile
|
||||
(canonical-package guile-2.2)))))
|
||||
(with-profile-lock profile
|
||||
(run-with-store store
|
||||
(build-and-install instances profile)))))))))))))))
|
||||
|
||||
;;; pull.scm ends here
|
||||
|
|
|
|||
Reference in New Issue