From eb72cdf087fe51d85e0c1514ec8e669047b5d6e1 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 11 Apr 2018 00:55:13 +0200 Subject: self: Produce a spliced (guix config) to placate Guile 2.0. Fixes 'guix pull' with Guile 2.0. See . * guix/self.scm (make-config.scm): Remove 'begin' in 'scheme-file' argument and pass #:splice? #t. --- guix/self.scm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/guix/self.scm b/guix/self.scm index 0730cd850d..6220efb397 100644 --- a/guix/self.scm +++ b/guix/self.scm @@ -384,7 +384,7 @@ list of file-name/file-like objects suitable as inputs to 'imported-files'." (define defmod 'define-module) (scheme-file "config.scm" - #~(begin + #~(;; The following expressions get spliced. (#$defmod (guix config) #:export (%guix-package-name %guix-version @@ -435,7 +435,12 @@ list of file-name/file-like objects suitable as inputs to 'imported-files'." (file-append zlib "/lib/libz"))) (define %nix-instantiate ;for (guix import snix) - "nix-instantiate")))) + "nix-instantiate")) + + ;; Guile 2.0 *requires* the 'define-module' to be at the + ;; top-level or it 'toplevel-ref' in the resulting .go file are + ;; made relative to a nonexistent anonymous module. + #:splice? #t)) -- cgit 1.4.1