summary refs log tree commit diff
diff options
context:
space:
mode:
authorMathieu Othacehe <othacehe@gnu.org>2020-11-02 20:58:39 +0100
committerMathieu Othacehe <othacehe@gnu.org>2020-11-02 21:02:39 +0100
commitb5f2a035f93519b27f46673e6d76665767a1fbd9 (patch)
tree277f1751ee33a3ff08b3da8a76a7c7c8ad70c435
parent1077d54f6e0e13383b64bfe9176ccf5f6e5e1ad6 (diff)
downloadguix-b5f2a035f93519b27f46673e6d76665767a1fbd9.tar.gz
ci: Restore license handling.
This is a follow-up of 7c02eb6c and 44daec7f. Restore the initial behaviour.

* gnu/ci.scm (package->alist): Restore license handling.
-rw-r--r--gnu/ci.scm11
1 files changed, 10 insertions, 1 deletions
diff --git a/gnu/ci.scm b/gnu/ci.scm
index 1d16805b4f..bf9952a450 100644
--- a/gnu/ci.scm
+++ b/gnu/ci.scm
@@ -89,7 +89,16 @@
         (system . ,(derivation-system drv))
         (description . ,(package-synopsis package))
         (long-description . ,(package-description package))
-        (license . ,(and=> (package-license package) license-name))
+
+        ;; XXX: Hydra ignores licenses that are not a <license> structure or a
+        ;; list thereof.
+        (license . ,(let loop ((license (package-license package)))
+                      (match license
+                        ((? license?)
+                         (license-name license))
+                        ((lst ...)
+                         (map loop license)))))
+
         (home-page . ,(package-home-page package))
         (maintainers . ("bug-guix@gnu.org"))
         (max-silent-time . ,(or (assoc-ref (package-properties package)