02/03: Remove workaround for 'time-monotonic' in Guile 2.2.2.

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit 9acacb71c958218fd69cf0fb9df0b439a980a0f2
Author: Ludovic Courtès <address@hidden>
AuthorDate: Sun Mar 22 15:58:49 2020 +0100

    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.
---
 build-aux/hydra/evaluate.scm | 7 -------
 guix/cache.scm               | 9 +--------
 guix/progress.scm            | 9 +--------
 guix/scripts/substitute.scm  | 7 -------
 guix/scripts/weather.scm     | 7 -------
 tests/cache.scm              | 9 +--------
 6 files changed, 3 insertions(+), 45 deletions(-)

diff --git a/build-aux/hydra/evaluate.scm b/build-aux/hydra/evaluate.scm
index 6e63a14..c74fcdb 100644
--- a/build-aux/hydra/evaluate.scm
+++ b/build-aux/hydra/evaluate.scm
@@ -42,13 +42,6 @@
     (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."
diff --git a/guix/cache.scm b/guix/cache.scm
index 1dc0083..feff131 100644
--- a/guix/cache.scm
+++ b/guix/cache.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <address@hidden>
+;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2020 Ludovic Courtès 
<address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -33,13 +33,6 @@
 ;;;
 ;;; Code:
 
-(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 (obsolete? date now ttl)
   "Return #t if DATE is obsolete compared to NOW + TTL seconds."
   (time>? (subtract-duration now (make-time time-duration 0 ttl))
diff --git a/guix/progress.scm b/guix/progress.scm
index c7567a3..fec65b4 100644
--- a/guix/progress.scm
+++ b/guix/progress.scm
@@ -1,7 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2017 Sou Bunnbu <address@hidden>
 ;;; Copyright © 2015 Steve Sprang <address@hidden>
-;;; Copyright © 2017, 2018, 2019 Ludovic Courtès <address@hidden>
+;;; Copyright © 2017, 2018, 2019, 2020 Ludovic Courtès <address@hidden>
 ;;; Copyright © 2018 Clément Lassieur <address@hidden>
 ;;;
 ;;; 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."
diff --git a/guix/scripts/substitute.scm b/guix/scripts/substitute.scm
index dfb975a..95b47a7 100755
--- a/guix/scripts/substitute.scm
+++ b/guix/scripts/substitute.scm
@@ -102,13 +102,6 @@
 ;;;
 ;;; Code:
 
-(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 %narinfo-cache-directory
   ;; A local cache of narinfos, to avoid going to the network.  Most of the
   ;; time, 'guix substitute' is called by guix-daemon as root and stores its
diff --git a/guix/scripts/weather.scm b/guix/scripts/weather.scm
index a9e0cba..eb76771 100644
--- a/guix/scripts/weather.scm
+++ b/guix/scripts/weather.scm
@@ -106,13 +106,6 @@ scope."
                '()
                packages)))))
 
-(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."
diff --git a/tests/cache.scm b/tests/cache.scm
index e46cdd8..80b44d6 100644
--- a/tests/cache.scm
+++ b/tests/cache.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2017 Ludovic Courtès <address@hidden>
+;;; Copyright © 2017, 2020 Ludovic Courtès <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -24,13 +24,6 @@
   #:use-module ((guix utils) #:select (call-with-temporary-directory))
   #:use-module (ice-9 match))
 
-(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))
-
 (test-begin "cache")
 
 (test-equal "remove-expired-cache-entries"