From b5f2a035f93519b27f46673e6d76665767a1fbd9 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Mon, 2 Nov 2020 20:58:39 +0100 Subject: [PATCH] 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. --- gnu/ci.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) 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 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) -- 2.20.1