diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2020-03-22 15:58:49 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2020-03-22 16:49:47 +0100 |
| commit | 9acacb71c958218fd69cf0fb9df0b439a980a0f2 (patch) | |
| tree | 67324a0405e11b78490faca2773e647bd9c96f5d /guix/progress.scm | |
| parent | 99b23eabdbb660b46403649997c3ed41aeab95bb (diff) | |
| download | guix-patches-9acacb71c958218fd69cf0fb9df0b439a980a0f2.tar guix-patches-9acacb71c958218fd69cf0fb9df0b439a980a0f2.tar.gz | |
Remove workaround for 'time-monotonic' in Guile 2.2.2.
This is a followup to e688c2df3924423b67892cc9939ca099c729d1cb.
* build-aux/hydra/evaluate.scm <top level>: Remove 'time-monotonic'
definition.
* guix/cache.scm: Likewise.
* guix/progress.scm: Likewise.
* guix/scripts/substitute.scm: Likewise.
* guix/scripts/weather.scm: Likewise.
* tests/cache.scm: Likewise.
Diffstat (limited to 'guix/progress.scm')
| -rw-r--r-- | guix/progress.scm | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/guix/progress.scm b/guix/progress.scm index c7567a35fd..fec65b424c 100644 --- a/guix/progress.scm +++ b/guix/progress.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017 Sou Bunnbu <iyzsong@gmail.com> ;;; Copyright © 2015 Steve Sprang <scs@stevesprang.com> -;;; Copyright © 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org> ;;; ;;; This file is part of GNU Guix. @@ -96,13 +96,6 @@ stopped." ;;; File download progress report. ;;; -(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 (nearest-exact-integer x) "Given a real number X, return the nearest exact integer, with ties going to the nearest exact even integer." |