diff options
| -rw-r--r-- | build-aux/hydra/guix-modular.scm | 6 | ||||
| -rw-r--r-- | gnu/ci.scm | 24 |
2 files changed, 30 insertions, 0 deletions
diff --git a/build-aux/hydra/guix-modular.scm b/build-aux/hydra/guix-modular.scm index c70e9d8d55..060b84b8ef 100644 --- a/build-aux/hydra/guix-modular.scm +++ b/build-aux/hydra/guix-modular.scm @@ -48,6 +48,12 @@ for SYSTEM. Use VERSION as the version identifier." #:pull-version 1 #:guile-version "2.2")))) `((derivation . ,(derivation-file-name drv)) ;the latest 2.2.x + (log . ,(log-file store (derivation-file-name drv))) + (outputs . ,(filter-map (lambda (res) + (match res + ((name . path) + `(,name . ,path)))) + (derivation->output-paths drv))) (nix-name . ,(derivation-name drv)) (system . ,(derivation-system drv)) (description . "Modular Guix") diff --git a/gnu/ci.scm b/gnu/ci.scm index c985cd653b..fc35be87b4 100644 --- a/gnu/ci.scm +++ b/gnu/ci.scm @@ -78,6 +78,12 @@ (let ((drv (package-derivation store package system #:graft? #f))) `((derivation . ,(derivation-file-name drv)) + (log . ,(log-file store (derivation-file-name drv))) + (outputs . ,(filter-map (lambda (res) + (match res + ((name . path) + `(,name . ,path)))) + (derivation->output-paths drv))) (nix-name . ,(derivation-name drv)) (system . ,(derivation-system drv)) (description . ,(package-synopsis package)) @@ -203,6 +209,12 @@ SYSTEM." "Return a list of jobs that build images for SYSTEM." (define (->alist drv) `((derivation . ,(derivation-file-name drv)) + (log . ,(log-file store (derivation-file-name drv))) + (outputs . ,(filter-map (lambda (res) + (match res + ((name . path) + `(,name . ,path)))) + (derivation->output-paths drv))) (nix-name . ,(derivation-name drv)) (system . ,(derivation-system drv)) (description . "Stand-alone image of the GNU system") @@ -308,6 +320,12 @@ system.") (system-test-value test)))) `((derivation . ,(derivation-file-name drv)) + (log . ,(log-file store (derivation-file-name drv))) + (outputs . ,(filter-map (lambda (res) + (match res + ((name . path) + `(,name . ,path)))) + (derivation->output-paths drv))) (nix-name . ,(derivation-name drv)) (system . ,(derivation-system drv)) (description . ,(format #f "Guix '~a' system test" @@ -339,6 +357,12 @@ system.") "Return Hydra jobs to build the self-contained Guix binary tarball." (define (->alist drv) `((derivation . ,(derivation-file-name drv)) + (log . ,(log-file store (derivation-file-name drv))) + (outputs . ,(filter-map (lambda (res) + (match res + ((name . path) + `(,name . ,path)))) + (derivation->output-paths drv))) (nix-name . ,(derivation-name drv)) (system . ,(derivation-system drv)) (description . "Stand-alone binary Guix tarball") |