~ruther/guix-local: profiles: Adjust to unintended manifest format change.

d34736c5c34e739c4e33a64cfa7871d689ba4780 — Ludovic Courtès 11 years ago dfd1d5e

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.

patch browse .tar.gz

1 files changed, 14 insertions(+), 6 deletions(-)

M guix/profiles.scm

M guix/profiles.scm => guix/profiles.scm +14 -6

@@ 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)))
 
     (_