diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-02-27 23:49:30 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-02-27 23:49:30 +0100 |
| commit | 829ecd002e70682d11a22e26a7fe7e87248a8fec (patch) | |
| tree | 0e44e654b30809882b2b1a7a9f5a67d23bb2bd3e /build-aux/hydra | |
| parent | 3bb33e24bb495d78e6be663b5763245a1d63bc90 (diff) | |
| parent | 65f7c35d02175806f676b8e130236dd3e6c8ec60 (diff) | |
| download | guix-829ecd002e70682d11a22e26a7fe7e87248a8fec.tar guix-829ecd002e70682d11a22e26a7fe7e87248a8fec.tar.gz | |
Merge branch 'master' into core-updates
Conflicts:
gnu/packages/libwebsockets.scm
Diffstat (limited to 'build-aux/hydra')
| -rw-r--r-- | build-aux/hydra/gnu-system.scm | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/build-aux/hydra/gnu-system.scm b/build-aux/hydra/gnu-system.scm index 4b0a922bb0..4f6eaf78f2 100644 --- a/build-aux/hydra/gnu-system.scm +++ b/build-aux/hydra/gnu-system.scm @@ -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." |