Hello community, here is the log from the commit of package guix for openSUSE:Factory checked in at 2019-08-01 15:48:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/guix (Old) and /work/SRC/openSUSE:Factory/.guix.new.4126 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "guix" Thu Aug 1 15:48:56 2019 rev:14 rq:720038 version:1.0.1 Changes: -------- --- /work/SRC/openSUSE:Factory/guix/guix.changes 2019-06-19 20:57:50.521952121 +0200 +++ /work/SRC/openSUSE:Factory/.guix.new.4126/guix.changes 2019-08-01 15:48:59.401736193 +0200 @@ -1,0 +2,12 @@ +Wed Jul 31 11:08:14 UTC 2019 - Jonathan Brielmaier <[email protected]> + +- Build only with 3 threads, because more threads leading to a core + dump of guile during the build. Upstream bug: + https://issues.guix.gnu.org/issue/36811 +- Fix issue where guix fails during download of packages, which + makes guix unusable. Apply patches from upstream. + Add patches: + * fix-time-duration-issue-part1.patch + * fix-time-duration-issue-part2.patch + +------------------------------------------------------------------- New: ---- fix-time-duration-issue-part1.patch fix-time-duration-issue-part2.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ guix.spec ++++++ --- /var/tmp/diff_new_pack.qfbjRP/_old 2019-08-01 15:49:00.549736038 +0200 +++ /var/tmp/diff_new_pack.qfbjRP/_new 2019-08-01 15:49:00.549736038 +0200 @@ -44,6 +44,10 @@ Source13: aarch64-linux-guile-2.0.14.tar.xz.sig Source20: run_guix_daemon.sh Source21: run_guix_publish.sh +# PATCH-FIX-UPSTREAM 88bc3c89bf5145d24c2270d2192b7be547e0024f -- guix fails on downloading +Patch0: fix-time-duration-issue-part1.patch +# PATH-FIX-UPSTREAM b6f5339dd0180fe73ab70d9c5b851ca0adc04193 -- guix fails on downloading +Patch1: fix-time-duration-issue-part2.patch BuildRequires: gcc-c++ BuildRequires: gnutls-guile BuildRequires: guile-charting @@ -83,6 +87,8 @@ %prep %setup -q +%patch0 -p1 +%patch1 -p1 # install service file to _unitdir sed -i 's@\$(libdir)/systemd/system@%{_unitdir}@' Makefile.in mkdir -p gnu/packages/bootstrap/{i686,x86_64,mips64el,armhf}-linux @@ -97,7 +103,8 @@ %configure \ --disable-silent-rules \ --with-bash-completion-dir=%{_datadir}/bash-completion/completions -make %{?_smp_mflags} +# guile 2.2.6 core dumps while build guix with more then 3 threads. See https://issues.guix.gnu.org/issue/36811 +make -j3 %install %make_install ++++++ fix-time-duration-issue-part1.patch ++++++ >From 88bc3c89bf5145d24c2270d2192b7be547e0024f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <[email protected]> Date: Sun, 2 Jun 2019 01:29:38 +0200 Subject: progress: Provide the proper type for %PROGRESS-INTERVAL. The (srfi srfi-19) module of Guile 2.9.2 catches the wrong type. * guix/progress.scm (%progress-interval): Change type to TIME-DURATION. --- guix/progress.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/guix/progress.scm b/guix/progress.scm index 65080bc..f150b08 100644 --- a/guix/progress.scm +++ b/guix/progress.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017 Sou Bunnbu <[email protected]> ;;; Copyright © 2015 Steve Sprang <[email protected]> -;;; Copyright © 2017, 2018 Ludovic Courtès <[email protected]> +;;; Copyright © 2017, 2018, 2019 Ludovic Courtès <[email protected]> ;;; Copyright © 2018 Clément Lassieur <[email protected]> ;;; ;;; This file is part of GNU Guix. @@ -229,7 +229,7 @@ throughput." (define %progress-interval ;; Default interval between subsequent outputs for rate-limited displays. - (make-time time-monotonic 200000000 0)) + (make-time time-duration 200000000 0)) (define* (progress-reporter/file file size #:optional (log-port (current-output-port)) -- cgit v1.0-41-gc330 ++++++ fix-time-duration-issue-part2.patch ++++++ >From b6f5339dd0180fe73ab70d9c5b851ca0adc04193 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <[email protected]> Date: Mon, 24 Jun 2019 23:10:13 +0200 Subject: progress: Call 'time-difference' on times of the same type. Guile 2.2.5 and 2.9.2 would catch the issue. This is a followup to 88bc3c89bf5145d24c2270d2192b7be547e0024f. * guix/progress.scm (display-download-progress)[elapsed]: Pass 'current-time' the same type as START-TIME. --- guix/progress.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/guix/progress.scm b/guix/progress.scm index f150b08..349637d 100644 --- a/guix/progress.scm +++ b/guix/progress.scm @@ -197,7 +197,9 @@ object) and TRANSFERRED (a total number of bytes) to determine the throughput." (define elapsed (duration->seconds - (time-difference (current-time time-monotonic) start-time))) + (time-difference (current-time (time-type start-time)) + start-time))) + (if (and (number? size) (not (zero? size))) (let* ((% (* 100.0 (/ transferred size))) (throughput (/ transferred elapsed)) -- cgit v1.0-41-gc330
