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:
parent
dfd1d5edf6
commit
d34736c5c3
|
@ -158,12 +158,20 @@ omitted or #f, use the first output of PACKAGE."
|
||||||
('packages ((name version output path deps) ...)))
|
('packages ((name version output path deps) ...)))
|
||||||
(manifest
|
(manifest
|
||||||
(map (lambda (name version output path deps)
|
(map (lambda (name version output path 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
|
(manifest-entry
|
||||||
(name name)
|
(name name)
|
||||||
(version version)
|
(version version)
|
||||||
(output output)
|
(output output)
|
||||||
(item path)
|
(item path)
|
||||||
(dependencies deps)))
|
(dependencies deps))))
|
||||||
name version output path deps)))
|
name version output path deps)))
|
||||||
|
|
||||||
(_
|
(_
|
||||||
|
|
Loading…
Reference in New Issue