diff options
| author | Mathieu Othacehe <othacehe@gnu.org> | 2020-10-01 11:46:53 +0200 |
|---|---|---|
| committer | Mathieu Othacehe <othacehe@gnu.org> | 2020-10-01 11:46:53 +0200 |
| commit | 3ca014d1df35c50f50c6658166d1149ccd2f0e19 (patch) | |
| tree | 48f3fc4e42901b089194a07a6224b22331117642 /build-aux | |
| parent | 5627bfe45ce46f498979b4ad2deab1fdfed22b6c (diff) | |
| download | guix-3ca014d1df35c50f50c6658166d1149ccd2f0e19.tar guix-3ca014d1df35c50f50c6658166d1149ccd2f0e19.tar.gz | |
ci: Add nix-name and system keys.
Add 'nix-name and 'system properties to hydra objects. This way Cuirass won't
have to go through every derivation to add those properties.
* gnu/ci.scm (package->alist, image-jobs, system-test-jobs, tarball-jobs): Add
'nix-name and 'system properties.
* build-aux/hydra/guix-modular.scm (build-job): Ditto.
Diffstat (limited to 'build-aux')
| -rw-r--r-- | build-aux/hydra/guix-modular.scm | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/build-aux/hydra/guix-modular.scm b/build-aux/hydra/guix-modular.scm index 8e07e7cd01..c70e9d8d55 100644 --- a/build-aux/hydra/guix-modular.scm +++ b/build-aux/hydra/guix-modular.scm @@ -43,17 +43,19 @@ for SYSTEM. Use VERSION as the version identifier." (define build (primitive-load (string-append source "/build-aux/build-self.scm"))) - `((derivation . ,(derivation-file-name - (run-with-store store - (build source #:version version #:system system - #:pull-version 1 - #:guile-version "2.2")))) ;the latest 2.2.x - (description . "Modular Guix") - (long-description - . "This is the modular Guix package as produced by 'guix pull'.") - (license . ,license:gpl3+) - (home-page . ,%guix-home-page-url) - (maintainers . (,%guix-bug-report-address))))) + (let ((drv (run-with-store store + (build source #:version version #:system system + #:pull-version 1 + #:guile-version "2.2")))) + `((derivation . ,(derivation-file-name drv)) ;the latest 2.2.x + (nix-name . ,(derivation-name drv)) + (system . ,(derivation-system drv)) + (description . "Modular Guix") + (long-description + . "This is the modular Guix package as produced by 'guix pull'.") + (license . ,license:gpl3+) + (home-page . ,%guix-home-page-url) + (maintainers . (,%guix-bug-report-address)))))) (define (hydra-jobs store arguments) "Return Hydra jobs." |