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

hydra: Update Guix job set. 

* build-aux/hydra/guix.scm (tarball-package): Remove 'nix-checkout'
  parameter.  Remove 'arguments', 'native-inputs', and 'location'
  fields.  Adjust caller accordingly.
  (hydra-jobs): Remove 'nix-checkout'.
This commit is contained in:
Ludovic Courtès 2015-05-01 22:09:00 +02:00
parent 2d51666bd0
commit a413bc8bd3
1 changed files with 7 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -68,25 +68,10 @@
(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 nix-checkout) (define (tarball-package 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))) (dist-package guix checkout))
(package (inherit dist)
(location (source-properties->location (current-source-location)))
(arguments (substitute-keyword-arguments (package-arguments dist)
((#:phases p)
`(alist-cons-before
'autoreconf 'set-nix-submodule
(lambda _
;; Tell Git to use the Nix checkout that Hydra gave us.
(zero?
(system* "git" "config" "submodule.nix-upstream.url"
,nix-checkout)))
,p))))
(native-inputs `(("git" ,git)
("graphviz" ,graphviz)
,@(package-native-inputs dist))))))
(define (hydra-jobs store arguments) (define (hydra-jobs store arguments)
"Return Hydra jobs." "Return Hydra jobs."
@ -104,13 +89,9 @@ containing a Git checkout of Guix."
(define guix-checkout (define guix-checkout
(assq-ref arguments 'guix)) (assq-ref arguments 'guix))
(define nix-checkout (let ((guix (assq-ref guix-checkout 'file-name)))
(assq-ref arguments 'nix)) (format (current-error-port) "using checkout ~s (~s)~%"
guix-checkout guix)
(format (current-error-port) "using checkout ~s (Nix: ~s)~%"
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 . ,(cute package->alist store
(tarball-package guix nix) (tarball-package guix)
(%current-system)))))) (%current-system))))))