civodul pushed a commit to branch master
in repository guix.
commit 54003af85cc5b689bd328b30617c93ed2f5fd647
Author: Ludovic Courtès <[email protected]>
AuthorDate: Mon Nov 14 11:05:22 2022 +0100
self: Mark the generation (guix config) as non-declarative.
Fixes <https://issues.guix.gnu.org/58927>.
Reported by Maxime Devos <[email protected]>
and Marius Bakke <[email protected]>.
Starting from 076e825dc5d585943ce820a279fffe4af09757fb, "guix --version"
would print "0" as the version number, due to '%guix-version' being
inlined in (guix ui) when compiling '*core-modules*' in (guix self).
* guix/self.scm (make-config.scm): Pass #:declarative? #f.
---
guix/self.scm | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/guix/self.scm b/guix/self.scm
index f46a09be52..93019e1c64 100644
--- a/guix/self.scm
+++ b/guix/self.scm
@@ -1090,6 +1090,12 @@ itself."
(scheme-file "config.scm"
#~(;; The following expressions get spliced.
(#$defmod (guix config)
+
+ ;; Mark it as non-declarative to prevent cross-module
+ ;; inlining that could lead to inlining %GUIX-VERSION in
+ ;; (guix ui).
+ #:declarative? #f
+
#:export (%guix-package-name
%guix-version
%guix-bug-report-address