From 72d9148fbf6e097cd8838b51c49f107c5176287a Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 18 Sep 2013 23:07:45 +0200 Subject: hydra: Pass the directory name of the Nix checkout. * build-aux/hydra/guix.scm (hydra-jobs): Extract the 'file-name' item from NIX-CHECKOUT, and pass that to 'tarball-package'. --- build-aux/hydra/guix.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'build-aux') diff --git a/build-aux/hydra/guix.scm b/build-aux/hydra/guix.scm index 941d240233..57041d695f 100644 --- a/build-aux/hydra/guix.scm +++ b/build-aux/hydra/guix.scm @@ -98,15 +98,16 @@ containing a Git checkout of Guix." (_ (list (%current-system))))) - (define checkout + (define guix-checkout (assq-ref arguments 'guix)) (define nix-checkout (assq-ref arguments 'nix)) (format (current-error-port) "using checkout ~s (Nix: ~s)~%" - checkout nix-checkout) - (let ((directory (assq-ref checkout 'file-name))) + guix-checkout nix-checkout) + (let ((guix (assq-ref guix-checkout 'file-name)) + (nix (assq-ref nix-checkout 'file-name))) `((tarball . ,(cute package->alist store - (tarball-package directory nix-checkout) + (tarball-package guix nix) (%current-system)))))) -- cgit 1.4.1