[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: download: Work around Guile 2.2 bug with 'time-monotonic' objects
From: |
Ludovic Courtès |
Subject: |
01/02: download: Work around Guile 2.2 bug with 'time-monotonic' objects. |
Date: |
Fri, 21 Apr 2017 19:25:29 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 1fe958d62ac33ef5e6da26ccc9213f4dae2ee1ae
Author: Ludovic Courtès <address@hidden>
Date: Sat Apr 22 01:09:45 2017 +0200
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 e3d5244..6563341 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))