diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2013-09-23 00:35:17 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2013-09-23 00:35:17 +0200 |
| commit | 5608847c6f4131e8f30321fdf25289efd73f8689 (patch) | |
| tree | 5a5910165d29455b249fd4d6612078ff5cf6ced5 /guix/scripts/pull.scm | |
| parent | 0c456db45bf03df61cdb71db7742a44f4328fb3d (diff) | |
| parent | f59e9eaac87b4365c646a475d44b431e43949649 (diff) | |
Merge branch 'master' into core-updates
Diffstat (limited to 'guix/scripts/pull.scm')
| -rw-r--r-- | guix/scripts/pull.scm | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm index adcaa49721..023b83e6a3 100644 --- a/guix/scripts/pull.scm +++ b/guix/scripts/pull.scm @@ -29,7 +29,6 @@ #:use-module (gnu packages compression) #:use-module (gnu packages gnupg) #:use-module (srfi srfi-1) - #:use-module (srfi srfi-11) #:use-module (srfi srfi-37) #:export (guix-pull)) @@ -198,13 +197,9 @@ Download and deploy the latest version of Guix.\n")) (if (assoc-ref opts 'verbose?) (current-error-port) (%make-void-port "w")))) - (let*-values (((config-dir) - (config-directory)) - ((source drv) - (unpack store tarball)) - ((source-dir) - (derivation-output-path - (assoc-ref (derivation-outputs drv) "out")))) + (let* ((config-dir (config-directory)) + (source (unpack store tarball)) + (source-dir (derivation->output-path source))) (if (show-what-to-build store (list source)) (if (build-derivations store (list source)) (let ((latest (string-append config-dir "/latest"))) |