Merge branch 'master' into core-updates

Conflicts:
	gnu/packages/libwebsockets.scm
This commit is contained in:
Ludovic Courtès 2014-02-27 23:49:30 +01:00
commit 829ecd002e
13 changed files with 404 additions and 171 deletions

View file

@ -66,7 +66,11 @@
(long-description . ,(package-description package))
(license . ,(package-license package))
(home-page . ,(package-home-page package))
(maintainers . ("bug-guix@gnu.org"))))
(maintainers . ("bug-guix@gnu.org"))
;; Work around versions of 'hydra-eval-guile-jobs' before Hydra commit
;; 61448ca (27 Feb. 2014) which used a default timeout of 2h.
(timeout . 72000)))
(define (package-job store job-name package system)
"Return a job called JOB-NAME that builds PACKAGE on SYSTEM."