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

hydra: Point the Git submodule to our local copy. 

* build-aux/hydra/guix.scm (tarball-package): Add 'nix-checkout'
  parameter.  Replace 'patch-bootstrap-script' phase by
  'set-nix-module'.
  (hydra-jobs): Get the 'nix' value from ARGUMENTS, and pass it to
  'tarball-package'.
This commit is contained in:
Ludovic Courtès 2013-09-18 19:00:03 +02:00
parent 59688fc4b5
commit 37c0ce3d27
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -63,7 +63,7 @@
(home-page . ,(package-home-page package)) (home-page . ,(package-home-page package))
(maintainers . ("bug-guix@gnu.org")))) (maintainers . ("bug-guix@gnu.org"))))
(define (tarball-package checkout) (define (tarball-package checkout nix-checkout)
"Return a package that does `make distcheck' from CHECKOUT, a directory "Return a package that does `make distcheck' from CHECKOUT, a directory
containing a Git checkout of Guix." containing a Git checkout of Guix."
(let ((dist (dist-package guix checkout))) (let ((dist (dist-package guix checkout)))
@ -72,12 +72,12 @@ containing a Git checkout of Guix."
(arguments (substitute-keyword-arguments (package-arguments dist) (arguments (substitute-keyword-arguments (package-arguments dist)
((#:phases p) ((#:phases p)
`(alist-cons-before `(alist-cons-before
'autoreconf 'patch-bootstrap-script 'autoreconf 'set-nix-submodule
(lambda _ (lambda _
;; Comment out `git' invocations, since Hydra provides ;; Tell Git to use the Nix checkout that Hydra gave us.
;; us with a checkout that includes sub-modules. (zero?
(substitute* "bootstrap" (system* "git" "config" "submodule.nix-upstream.url"
(("git ") "true git "))) nix-checkout)))
,p)))) ,p))))
(native-inputs `(("git" ,git) (native-inputs `(("git" ,git)
("graphviz" ,graphviz) ("graphviz" ,graphviz)
@ -99,8 +99,12 @@ containing a Git checkout of Guix."
(define checkout (define checkout
(assq-ref arguments 'guix)) (assq-ref arguments 'guix))
(format (current-error-port) "using checkout ~s~%" checkout) (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))) (let ((directory (assq-ref checkout 'file-name)))
`((tarball . ,(cute package->alist store `((tarball . ,(cute package->alist store
(tarball-package directory) (tarball-package directory nix-checkout)
(%current-system)))))) (%current-system))))))