nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

self: Produce a spliced (guix config) to placate Guile 2.0. 

Fixes 'guix pull' with Guile 2.0.
See <https://debbugs.gnu.org/cgi/bugreport.cgi?bug=27284#153>.

* guix/self.scm (make-config.scm): Remove 'begin' in 'scheme-file'
argument and pass #:splice? #t.
This commit is contained in:
Ludovic Courtès 2018-04-11 00:55:13 +02:00
parent 4fbd1a2b7f
commit eb72cdf087
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
guix/self.scm
View File

@ -384,7 +384,7 @@ list of file-name/file-like objects suitable as inputs to 'imported-files'."
(define defmod 'define-module) (define defmod 'define-module)
(scheme-file "config.scm" (scheme-file "config.scm"
#~(begin #~(;; The following expressions get spliced.
(#$defmod (guix config) (#$defmod (guix config)
#:export (%guix-package-name #:export (%guix-package-name
%guix-version %guix-version
@ -435,7 +435,12 @@ list of file-name/file-like objects suitable as inputs to 'imported-files'."
(file-append zlib "/lib/libz"))) (file-append zlib "/lib/libz")))
(define %nix-instantiate ;for (guix import snix) (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))