~ruther/guix-local

1fe958d62ac33ef5e6da26ccc9213f4dae2ee1ae — Ludovic Courtès 9 years ago 6ef94ec
download: Work around Guile 2.2 bug with 'time-monotonic' objects.

* guix/build/download.scm (time-monotonic) [guile-2.2]: New variable.
1 files changed, 8 insertions(+), 0 deletions(-)

M guix/build/download.scm
M guix/build/download.scm => guix/build/download.scm +8 -0
@@ 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))