forked from lix-project/hydra
hydra-eval-guile-jobs: Adjust to multiple-output format.
This is a followup to commit
10882a1ffd
("Add multiple output
support").
* src/script/hydra-eval-guile-jobs.in (job-evaluations->sxml): Return
several `output' tags in the body, and remove the `outPath' attribute
of `job'.
This commit is contained in:
parent
9da89dd32b
commit
9a9f37f209
|
@ -91,17 +91,11 @@ symbol/thunk pairs."
|
|||
;; XXX: Add <arg ...> tags?
|
||||
`(job (@ (jobName ,name)
|
||||
(drvPath ,drv)
|
||||
(outPath
|
||||
;; Resolve Guix modules lazily.
|
||||
,((guix-variable 'derivations
|
||||
'derivation-path->output-path)
|
||||
drv))
|
||||
,@(opt-attr 'homepage 'home-page)
|
||||
(license
|
||||
,(let loop ((license (assoc-ref result 'license)))
|
||||
(match license
|
||||
((? struct?)
|
||||
;; XXX: hack to access <license> objects
|
||||
(struct-ref license 0))
|
||||
((l ...)
|
||||
(string-join (map loop l)))
|
||||
|
@ -129,6 +123,14 @@ symbol/thunk pairs."
|
|||
(compose %derivation-system
|
||||
(guix-variable 'derivations
|
||||
'read-derivation)))))
|
||||
;; Resolve Guix modules lazily.
|
||||
,(map (match-lambda
|
||||
((name . path)
|
||||
`(output (@ (name ,name) (path ,path)))))
|
||||
((guix-variable 'derivations
|
||||
'derivation-path->output-paths)
|
||||
drv))
|
||||
|
||||
"\n"))))
|
||||
jobs))))
|
||||
|
||||
|
|
Loading…
Reference in a new issue