04/06: maint: Add 'time-monotonic' bug workaround in build-aux/hydra/evaluate.scm.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit 7f4da8ff6b382dce49954f272afc219b1ad4db20
Author: Ludovic Courtès <address@hidden>
Date:   Sat May 6 23:27:33 2017 +0200

    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.
---
 build-aux/hydra/evaluate.scm | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/build-aux/hydra/evaluate.scm b/build-aux/hydra/evaluate.scm
index ab10253..cc6a4b9 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 <address@hidden>
+;;; Copyright © 2016, 2017 Ludovic Courtès <address@hidden>
 ;;;
 ;;; 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."