aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2013-09-21 22:12:20 +0200
committerLudovic Courtès <ludo@gnu.org>2013-09-21 22:16:26 +0200
commit3b627eac48de41b1dc3a1132be961855dd9d0321 (patch)
treeccaf4996d610d9d3fb3aec84c6930f01fcb9e6f7
parent0352532e6a3340411f10ff9ca7475343f7df25fc (diff)
downloadguix-3b627eac48de41b1dc3a1132be961855dd9d0321.tar
guix-3b627eac48de41b1dc3a1132be961855dd9d0321.tar.gz
pull: Adjust to 'derivation' API change.
Fixes <http://bugs.gnu.org/15428>. Reported by Cyrill Schenkel <cyrill.schenkel@gmail.com>. * guix/scripts/pull.scm (guix-pull): 'unpack' returns a single value.
-rw-r--r--guix/scripts/pull.scm11
1 files changed, 3 insertions, 8 deletions
diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm
index f3d87a63c0..a1b5cdc991 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))
@@ -200,13 +199,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")))