diff options
author | Marius Bakke <marius@gnu.org> | 2021-08-12 00:30:27 +0200 |
---|---|---|
committer | Marius Bakke <marius@gnu.org> | 2021-08-12 00:30:27 +0200 |
commit | c4133c43c7cfe2476ebfae87f9e4d10d96de9bc7 (patch) | |
tree | 47bd773d2f434384b54e56916c1a287dd8e51511 /guix/scripts/time-machine.scm | |
parent | ffa01e68859bb7a6daa9fcffdc8d77ca35db4bc0 (diff) | |
parent | 4eb0a5146ae5a195a29c79f586fcc1e58f7fa69b (diff) | |
download | guix-patches-c4133c43c7cfe2476ebfae87f9e4d10d96de9bc7.tar guix-patches-c4133c43c7cfe2476ebfae87f9e4d10d96de9bc7.tar.gz |
Merge branch 'master' into core-updates-frozen
Conflicts:
gnu/packages/algebra.scm
gnu/packages/games.scm
gnu/packages/golang.scm
gnu/packages/kerberos.scm
gnu/packages/mail.scm
gnu/packages/python.scm
gnu/packages/ruby.scm
gnu/packages/scheme.scm
gnu/packages/tex.scm
gnu/packages/tls.scm
gnu/packages/version-control.scm
Diffstat (limited to 'guix/scripts/time-machine.scm')
-rw-r--r-- | guix/scripts/time-machine.scm | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/guix/scripts/time-machine.scm b/guix/scripts/time-machine.scm index 4aafd432e8..5179ea035f 100644 --- a/guix/scripts/time-machine.scm +++ b/guix/scripts/time-machine.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019 Konrad Hinsen <konrad.hinsen@fastmail.net> -;;; Copyright © 2019, 2020 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2021 Simon Tournier <zimon.toutoune@gmail.com> ;;; ;;; This file is part of GNU Guix. @@ -141,13 +141,19 @@ Execute COMMAND ARGS... in an older version of Guix.\n")) (let* ((opts (parse-args args)) (channels (channel-list opts)) (command-line (assoc-ref opts 'exec)) + (substitutes? (assoc-ref opts 'substitutes?)) (authenticate? (assoc-ref opts 'authenticate-channels?))) (when command-line (let* ((directory (with-store store (with-status-verbosity (assoc-ref opts 'verbosity) - (set-build-options-from-command-line store opts) - (cached-channel-instance store channels - #:authenticate? authenticate?)))) + (with-build-handler (build-notifier #:use-substitutes? + substitutes? + #:verbosity + (assoc-ref opts 'verbosity) + #:dry-run? #f) + (set-build-options-from-command-line store opts) + (cached-channel-instance store channels + #:authenticate? authenticate?))))) (executable (string-append directory "/bin/guix"))) (apply execl (cons* executable executable command-line)))))))) |