From 54003af85cc5b689bd328b30617c93ed2f5fd647 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Mon, 14 Nov 2022 11:05:22 +0100
Subject: self: Mark the generation (guix config) as non-declarative.

Fixes <https://issues.guix.gnu.org/58927>.
Reported by Maxime Devos <maximedevos@telenet.be>
and Marius Bakke <marius@gnu.org>.

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(+)

(limited to 'guix/self.scm')

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 @@ (define defmod 'define-module)
   (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
-- 
cgit v1.2.3