From 3b627eac48de41b1dc3a1132be961855dd9d0321 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 21 Sep 2013 22:12:20 +0200 Subject: pull: Adjust to 'derivation' API change. Fixes . Reported by Cyrill Schenkel . * guix/scripts/pull.scm (guix-pull): 'unpack' returns a single value. --- guix/scripts/pull.scm | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'guix/scripts/pull.scm') 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 @@ (define-module (guix scripts pull) #: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 @@ (define (parse-options) (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"))) -- cgit v1.2.3