mirror of
git://git.savannah.gnu.org/guix/guix-cuirass.git
synced 2024-12-29 11:40:16 +01:00
Expect nix-name and system to be part of the evaluation.
* src/cuirass/base.scm (evaluate): Expect 'nix-name and 'system properties to be provided by the evaluation. (build-packages): Use the eval-id provided as argument.
This commit is contained in:
parent
4d7864c046
commit
39f6e930ba
1 changed files with 1 additions and 10 deletions
|
@ -310,14 +310,6 @@ fibers."
|
|||
(define (evaluate store spec eval-id checkouts)
|
||||
"Evaluate and build package derivations defined in SPEC, using CHECKOUTS.
|
||||
Return a list of jobs that are associated to EVAL-ID."
|
||||
(define (augment-job job)
|
||||
(let ((drv (read-derivation-from-file
|
||||
(assq-ref job #:derivation))))
|
||||
`((#:eval-id . ,eval-id)
|
||||
(#:nix-name . ,(derivation-name drv))
|
||||
(#:system . ,(derivation-system drv))
|
||||
,@job)))
|
||||
|
||||
(define log-file
|
||||
(evaluation-log-file eval-id))
|
||||
|
||||
|
@ -369,7 +361,7 @@ Return a list of jobs that are associated to EVAL-ID."
|
|||
(('evaluation jobs)
|
||||
(let* ((spec-name (assq-ref spec #:name)))
|
||||
(log-message "evaluation ~a for '~a' completed" eval-id spec-name)
|
||||
(map augment-job jobs))))))
|
||||
jobs)))))
|
||||
|
||||
|
||||
;;;
|
||||
|
@ -710,7 +702,6 @@ otherwise."
|
|||
(define (register job)
|
||||
(let* ((name (assq-ref job #:job-name))
|
||||
(drv (assq-ref job #:derivation))
|
||||
(eval-id (assq-ref job #:eval-id))
|
||||
(job-name (assq-ref job #:job-name))
|
||||
(system (assq-ref job #:system))
|
||||
(nix-name (assq-ref job #:nix-name))
|
||||
|
|
Loading…
Reference in a new issue