Maxime Devos schreef op za 19-03-2022 om 23:33 [+0100]: > Maxime Devos schreef op za 19-03-2022 om 23:28 [+0100]: > > The only use of 'module-re-export!' in current Guix is > > > > (module-re-export! (current-module) '(delete) #:replace? #t) > > > > from (guix packages). > > > > Probably the issue is that 'module-re-export!' did not always support > > #:replace?, and that 1.1.0 uses an old version of Guile with the old > > calling convention when computing the derivation ... (I don't know > > if these details are actually true, it's a bit of a guess.) > > The extra argument of module-re-export! was introduced with commit > cf08dbdc189f0005cab6f2ec7b23ed9d150ec43d in Guile. It seems like the > first Guile version after this commit is v2.2.7. Let's try > making the '#:replace? ...' conditional upon Guile>2.2 ...
I think I have a fix, see attached patch. Currently it's at ‘building ...-module-import-compiled.drv’ (97%). Greetings, Maxime.
From f9a53bb4bccb55bb6d0f55daed778ee86eb50f5e Mon Sep 17 00:00:00 2001 From: Maxime Devos <maximede...@telenet.be> Date: Sat, 19 Mar 2022 22:39:33 +0000 Subject: [PATCH] packages: Fix time-travel from Guix 1.1.0 / Guile < 2.2.7. * guix/packages.scm: Only set #:replace? #true when Guile is >= 2.2.7. Fixes: <https://issues.guix.gnu.org/53765> Reported-By: Peter Kois <kan...@gmail.com> --- guix/packages.scm | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/guix/packages.scm b/guix/packages.scm index 9d5b23eb8a..37f5a6aa5f 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2019 Marius Bakke <mba...@fastmail.com> ;;; Copyright © 2020, 2021 Maxim Cournoyer <maxim.courno...@gmail.com> ;;; Copyright © 2021 Chris Marusich <cmmarus...@gmail.com> +;;; Copyright © 2022 Maxime Devos <maximede...@telenet.be> ;;; ;;; This file is part of GNU Guix. ;;; @@ -182,8 +183,16 @@ ;; The 'source-module-closure' procedure ca. 1.2.0 did not recognize ;; #:re-export-and-replace: <https://issues.guix.gnu.org/52694>. -;; Work around it. -(module-re-export! (current-module) '(delete) #:replace? #t) +;; Work around it. The #:replace? argument is only supported by +;; Guile 2.2.7 and later, work-around it if necessary to allow +;; time-travel from 1.1.0, see <https://issues.guix.gnu.org/53765>. +(let ((major (string->number (major-version)))) + (if (or (>= major 3) + (and (= major 2) + (= (string->number (minor-version)) 2) ; there is no Guile 2.3.X + (>= (string->number (micro-version)) 7))) + (module-re-export! (current-module) '(delete) #:replace? #t) + (module-re-export! (current-module) '(delete)))) ;;; Commentary: ;;; base-commit: 29091731a0c6cb649cdfd72297575fe2bb2a9591 -- 2.30.2
signature.asc
Description: This is a digitally signed message part
