diff options
| author | Konrad Hinsen <konrad.hinsen@fastmail.net> | 2019-11-12 16:39:46 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-11-15 23:28:17 +0100 |
| commit | 1d5485690ba75d6b355fd519caf40881a606678b (patch) | |
| tree | 5698da3ac822254dd9c273eb751c2cd982ec990a /guix/scripts | |
| parent | f675f8dec73d02e319e607559ed2316c299ae8c7 (diff) | |
| download | gnu-guix-1d5485690ba75d6b355fd519caf40881a606678b.tar gnu-guix-1d5485690ba75d6b355fd519caf40881a606678b.tar.gz | |
inferior: 'cached-channel-instance' takes an open store connection.
* guix/inferior.scm (cached-channel-instance): Take an explicit 'store'
argument.
(inferior-for-channels): Wrap call to 'cached-channel-instance' in
'with-store'.
* guix/time-machine.scm (guix-time-machine): Wrap call to
'cached-channel-instance' in 'with-store'.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Diffstat (limited to 'guix/scripts')
| -rw-r--r-- | guix/scripts/time-machine.scm | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/guix/scripts/time-machine.scm b/guix/scripts/time-machine.scm index a6598fb0f7..a64badc27b 100644 --- a/guix/scripts/time-machine.scm +++ b/guix/scripts/time-machine.scm @@ -21,6 +21,7 @@ #:use-module (guix scripts) #:use-module (guix inferior) #:use-module (guix channels) + #:use-module (guix store) #:use-module ((guix scripts pull) #:select (channel-list)) #:use-module (ice-9 match) #:use-module (srfi srfi-1) @@ -97,6 +98,7 @@ Execute COMMAND ARGS... in an older version of Guix.\n")) (channels (channel-list opts)) (command-line (assoc-ref opts 'exec))) (when command-line - (let* ((directory (cached-channel-instance channels)) + (let* ((directory (with-store store + (cached-channel-instance store channels))) (executable (string-append directory "/bin/guix"))) (apply execl (cons* executable executable command-line))))))) |