From 98cda1b997442524ec8027fa1c1f9643eba6154b Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 8 Apr 2018 22:07:47 +0200 Subject: hydra: guix-modular: Honor the 'systems' argument. * build-aux/hydra/guix-modular.scm (hydra-jobs)[systems]: Define as in gnu-system.scm. Honor SYSTEMS. --- build-aux/hydra/guix-modular.scm | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'build-aux') diff --git a/build-aux/hydra/guix-modular.scm b/build-aux/hydra/guix-modular.scm index 2885759df0..58e09e1831 100644 --- a/build-aux/hydra/guix-modular.scm +++ b/build-aux/hydra/guix-modular.scm @@ -57,14 +57,10 @@ for SYSTEM. Use VERSION as the version identifier." (define (hydra-jobs store arguments) "Return Hydra jobs." (define systems - (match (filter-map (match-lambda - (('system . value) value) - (_ #f)) - arguments) - ((lst ..1) - lst) - (_ - (list (%current-system))))) + (match (assoc-ref arguments 'systems) + (#f %hydra-supported-systems) + ((lst ...) lst) + ((? string? str) (call-with-input-string str read)))) (define guix-checkout (or (assq-ref arguments 'guix) ;Hydra on hydra @@ -83,4 +79,4 @@ for SYSTEM. Use VERSION as the version identifier." (string-append "guix." system)))) `(,name . ,(build-job store file version system)))) - %hydra-supported-systems))) + systems))) -- cgit 1.4.1