From 7f4da8ff6b382dce49954f272afc219b1ad4db20 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 6 May 2017 23:27:33 +0200 Subject: maint: Add 'time-monotonic' bug workaround in build-aux/hydra/evaluate.scm. * build-aux/hydra/evaluate.scm: Add 'time-monotonic' workaround for Guile 2.2. --- build-aux/hydra/evaluate.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'build-aux/hydra') diff --git a/build-aux/hydra/evaluate.scm b/build-aux/hydra/evaluate.scm index ab10253f31..cc6a4b9492 100644 --- a/build-aux/hydra/evaluate.scm +++ b/build-aux/hydra/evaluate.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2016 Ludovic Courtès +;;; Copyright © 2016, 2017 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -32,6 +32,13 @@ (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." -- cgit v1.2.3 From d116695b315f75b93ac8083721b522a82a7cc139 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 16 May 2017 14:14:46 +0200 Subject: hydra: Cross-build Guile 2.2. * build-aux/hydra/gnu-system.scm (%core-packages): Add GUILE-2.2. --- build-aux/hydra/gnu-system.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build-aux/hydra') diff --git a/build-aux/hydra/gnu-system.scm b/build-aux/hydra/gnu-system.scm index 507c6abe0e..b1faa2265a 100644 --- a/build-aux/hydra/gnu-system.scm +++ b/build-aux/hydra/gnu-system.scm @@ -111,7 +111,7 @@ SYSTEM." ;; chain.) (list gcc-4.8 gcc-4.9 gcc-5 glibc binutils gmp mpfr mpc coreutils findutils diffutils patch sed grep - gawk gnu-gettext hello guile-2.0 zlib gzip xz + gawk gnu-gettext hello guile-2.0 guile-2.2 zlib gzip xz %bootstrap-binaries-tarball %binutils-bootstrap-tarball (%glibc-bootstrap-tarball) -- cgit v1.2.3