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

hydra: Add missing phase and inputs for 'make dist' job. 

* build-aux/hydra/guix.scm (tarball-package): Inherit from 'guix-devel'
rather than 'guix'.  Pass #:phases to 'dist-package'.
This commit is contained in:
Ludovic Courtès 2016-01-13 17:39:49 +01:00
parent b8a35309f8
commit 7a2eed3aac
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
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, 2015 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -47,6 +47,7 @@
(guix build-system gnu) (guix build-system gnu)
(gnu packages version-control) (gnu packages version-control)
(gnu packages package-management) (gnu packages package-management)
(gnu packages imagemagick)
(gnu packages graphviz) (gnu packages graphviz)
(gnu packages man) (gnu packages man)
(srfi srfi-1) (srfi srfi-1)
@ -72,12 +73,25 @@
(define (tarball-package 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."
(dist-package (package (let ((guix (@@ (gnu packages package-management) guix)))
(inherit guix) (dist-package (package
(native-inputs `(("graphviz" ,graphviz) (inherit guix)
("help2man" ,help2man) (arguments (package-arguments guix))
,@(package-native-inputs guix)))) (native-inputs `(("imagemagick" ,imagemagick)
checkout)) ,@(package-native-inputs guix))))
checkout
#:phases
'(modify-phases %dist-phases
(add-before 'build 'build-daemon
;; Build 'guix-daemon' first so that help2man
;; successfully creates 'guix-daemon.1'.
(lambda _
(let ((n (number->string
(parallel-job-count))))
(zero? (system* "make"
"nix/libstore/schema.sql.hh"
"guix-daemon" "-j" n)))))))))
(define (hydra-jobs store arguments) (define (hydra-jobs store arguments)
"Return Hydra jobs." "Return Hydra jobs."