diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2017-05-06 23:27:33 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2017-05-07 00:18:36 +0200 |
| commit | 7f4da8ff6b382dce49954f272afc219b1ad4db20 (patch) | |
| tree | aa0827988624d2ebecb73f7c63444fb65bd6bd08 | |
| parent | 94fa8d76163bd08e6f680dc300b551f36415687e (diff) | |
| download | guix-7f4da8ff6b382dce49954f272afc219b1ad4db20.tar guix-7f4da8ff6b382dce49954f272afc219b1ad4db20.tar.gz | |
maint: Add 'time-monotonic' bug workaround in build-aux/hydra/evaluate.scm.
* build-aux/hydra/evaluate.scm: Add 'time-monotonic' workaround for
Guile 2.2.
| -rw-r--r-- | build-aux/hydra/evaluate.scm | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/build-aux/hydra/evaluate.scm b/build-aux/hydra/evaluate.scm index ab10253f31..cc6a4b9492 100644 --- a/build-aux/hydra/evaluate.scm +++ b/build-aux/hydra/evaluate.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2016 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2016, 2017 Ludovic Courtès <ludo@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -32,6 +32,13 @@ (beautify-user-module! m) m)) +(cond-expand + (guile-2.2 + ;; Guile 2.2.2 has a bug whereby 'time-monotonic' objects have seconds and + ;; nanoseconds swapped (fixed in Guile commit 886ac3e). Work around it. + (define time-monotonic time-tai)) + (else #t)) + (define (call-with-time thunk kont) "Call THUNK and pass KONT the elapsed time followed by THUNK's return values." |