profiles: Adjust to unintended manifest format change.

Reported by Andreas Enge.

* guix/profiles.scm (sexp->manifest): Adjust to handle unintended format
  change introduced in 4ca0b41.
This commit is contained in:
Ludovic Courtès 2014-08-12 22:09:42 +02:00
parent dfd1d5edf6
commit d34736c5c3
1 changed files with 14 additions and 6 deletions

View File

@ -158,12 +158,20 @@ omitted or #f, use the first output of PACKAGE."
('packages ((name version output path deps) ...)))
(manifest
(map (lambda (name version output path deps)
(manifest-entry
(name name)
(version version)
(output output)
(item path)
(dependencies deps)))
;; Up to Guix 0.7 included, dependencies were listed as ("gmp"
;; "/gnu/store/...-gmp") for instance. Discard the 'label' in
;; such lists.
(let ((deps (match deps
(((labels directories) ...)
directories)
((directories ...)
directories))))
(manifest-entry
(name name)
(version version)
(output output)
(item path)
(dependencies deps))))
name version output path deps)))
(_