nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Ludovic Courtès 2013-09-21 22:12:20 +02:00
parent 0352532e6a
commit 3b627eac48
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
guix/scripts/pull.scm
View File

@ -29,7 +29,6 @@
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages gnupg) #:use-module (gnu packages gnupg)
#:use-module (srfi srfi-1) #:use-module (srfi srfi-1)
#:use-module (srfi srfi-11)
#:use-module (srfi srfi-37) #:use-module (srfi srfi-37)
#:export (guix-pull)) #:export (guix-pull))
@ -200,13 +199,9 @@ Download and deploy the latest version of Guix.\n"))
(if (assoc-ref opts 'verbose?) (if (assoc-ref opts 'verbose?)
(current-error-port) (current-error-port)
(%make-void-port "w")))) (%make-void-port "w"))))
(let*-values (((config-dir) (let* ((config-dir (config-directory))
(config-directory)) (source (unpack store tarball))
((source drv) (source-dir (derivation->output-path source)))
(unpack store tarball))
((source-dir)
(derivation-output-path
(assoc-ref (derivation-outputs drv) "out"))))
(if (show-what-to-build store (list source)) (if (show-what-to-build store (list source))
(if (build-derivations store (list source)) (if (build-derivations store (list source))
(let ((latest (string-append config-dir "/latest"))) (let ((latest (string-append config-dir "/latest")))