From 1fe958d62ac33ef5e6da26ccc9213f4dae2ee1ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 22 Apr 2017 01:09:45 +0200 Subject: [PATCH] download: Work around Guile 2.2 bug with 'time-monotonic' objects. * guix/build/download.scm (time-monotonic) [guile-2.2]: New variable. --- guix/build/download.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/guix/build/download.scm b/guix/build/download.scm index e3d5244590..6563341b9f 100644 --- a/guix/build/download.scm +++ b/guix/build/download.scm @@ -140,6 +140,14 @@ Otherwise return STORE-PATH." (string-drop base 32))) store-path)) +(cond-expand + (guile-2.2 + ;; Guile 2.2.0 to 2.2.2 included 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* (progress-proc file size #:optional (log-port (current-output-port)) #:key (abbreviation basename))