diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2016-01-13 17:39:49 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-01-13 17:43:21 +0100 |
| commit | 7a2eed3aac1ecd0bdf293e33a234fad58f2e5f9e (patch) | |
| tree | ffbc434242546f45c493d648b783eec495996311 /build-aux/hydra | |
| parent | b8a35309f848f676cf7d4b3bbec9b92de554e27a (diff) | |
| download | guix-patches-7a2eed3aac1ecd0bdf293e33a234fad58f2e5f9e.tar guix-patches-7a2eed3aac1ecd0bdf293e33a234fad58f2e5f9e.tar.gz | |
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'.
Diffstat (limited to 'build-aux/hydra')
| -rw-r--r-- | build-aux/hydra/guix.scm | 28 |
1 files changed, 21 insertions, 7 deletions
diff --git a/build-aux/hydra/guix.scm b/build-aux/hydra/guix.scm index a6f7923fb8..f496357562 100644 --- a/build-aux/hydra/guix.scm +++ b/build-aux/hydra/guix.scm @@ -1,5 +1,5 @@ ;;; 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. ;;; @@ -47,6 +47,7 @@ (guix build-system gnu) (gnu packages version-control) (gnu packages package-management) + (gnu packages imagemagick) (gnu packages graphviz) (gnu packages man) (srfi srfi-1) @@ -72,12 +73,25 @@ (define (tarball-package checkout) "Return a package that does `make distcheck' from CHECKOUT, a directory containing a Git checkout of Guix." - (dist-package (package - (inherit guix) - (native-inputs `(("graphviz" ,graphviz) - ("help2man" ,help2man) - ,@(package-native-inputs guix)))) - checkout)) + (let ((guix (@@ (gnu packages package-management) guix))) + (dist-package (package + (inherit guix) + (arguments (package-arguments guix)) + (native-inputs `(("imagemagick" ,imagemagick) + ,@(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) "Return Hydra jobs." |