diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2013-09-18 23:07:45 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2013-09-18 23:07:45 +0200 |
| commit | 72d9148fbf6e097cd8838b51c49f107c5176287a (patch) | |
| tree | 72da8c9a3623862cdce437cf95ff91ecc3b06fac /build-aux | |
| parent | 1210c32eccbc62f3711dacc306cd5e94a94580d1 (diff) | |
| download | gnu-guix-72d9148fbf6e097cd8838b51c49f107c5176287a.tar gnu-guix-72d9148fbf6e097cd8838b51c49f107c5176287a.tar.gz | |
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'.
Diffstat (limited to 'build-aux')
| -rw-r--r-- | build-aux/hydra/guix.scm | 9 |
1 files changed, 5 insertions, 4 deletions
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)))))) |