nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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'.
This commit is contained in:
Ludovic Courtès 2013-09-18 23:07:45 +02:00
parent 1210c32ecc
commit 72d9148fbf
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
build-aux/hydra/guix.scm
View File

@ -98,15 +98,16 @@ containing a Git checkout of Guix."
(_ (_
(list (%current-system))))) (list (%current-system)))))
(define checkout (define guix-checkout
(assq-ref arguments 'guix)) (assq-ref arguments 'guix))
(define nix-checkout (define nix-checkout
(assq-ref arguments 'nix)) (assq-ref arguments 'nix))
(format (current-error-port) "using checkout ~s (Nix: ~s)~%" (format (current-error-port) "using checkout ~s (Nix: ~s)~%"
checkout nix-checkout) guix-checkout nix-checkout)
(let ((directory (assq-ref checkout 'file-name))) (let ((guix (assq-ref guix-checkout 'file-name))
(nix (assq-ref nix-checkout 'file-name)))
`((tarball . ,(cute package->alist store `((tarball . ,(cute package->alist store
(tarball-package directory nix-checkout) (tarball-package guix nix)
(%current-system)))))) (%current-system))))))