From a3efa4f9eb11b8dc08ab154931ef2a2ef14c0ab7 Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Fri, 27 Mar 2020 15:24:02 +0100
Subject: gnu: emacs: Fix format strings for compatibility with Guile 3.

* gnu/packages/emacs.scm (emacs)[arguments]: In the 'patch-program-file-names'
and 'install-site-start' phases, specify port in the calls to FORMAT.
---
 gnu/packages/emacs.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index fa420cacf7..0938dabf1e 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -139,7 +139,7 @@
                             "lisp/textmodes/artist.el"
                             "lisp/progmodes/sh-script.el")
                (("\"/bin/sh\"")
-                (format "~s" (which "sh"))))
+                (format #f "~s" (which "sh"))))
              #t))
          (add-before 'configure 'fix-/bin/pwd
            (lambda _
@@ -163,7 +163,7 @@
                                (byte-recompile-directory
                                 (file-name-as-directory ,dir) 0 1))))
                    (invoke emacs "--quick" "--batch"
-                           (format "--eval=~s" expr))))
+                           (format #f "--eval=~s" expr))))
 
                (copy-file (assoc-ref inputs "guix-emacs.el")
                           (string-append lisp-dir "/guix-emacs.el"))
-- 
cgit v1.2.3

 href='/guix/commit/tests/modules.scm?id=6e174c4edd4786d93c1e424c45052f70b2bb3fb0'>commit</a><a href='/guix/diff/tests/modules.scm?id=6e174c4edd4786d93c1e424c45052f70b2bb3fb0'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/tests/modules.scm'>
<input type='hidden' name='id' value='6e174c4edd4786d93c1e424c45052f70b2bb3fb0'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=6e174c4edd4786d93c1e424c45052f70b2bb3fb0'>root</a>/<a href='/guix/log/tests?id=6e174c4edd4786d93c1e424c45052f70b2bb3fb0'>tests</a>/<a href='/guix/log/tests/modules.scm?id=6e174c4edd4786d93c1e424c45052f70b2bb3fb0'>modules.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/tests/modules.scm?id=6e174c4edd4786d93c1e424c45052f70b2bb3fb0&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2021-12-23 10:54:00 +0100'>2021-12-23</span></td><td><a href='/guix/commit/tests/modules.scm?id=05a9d1f378e2e13e8f759be926ea368358afc27c'>Remove VM generation dead-code.</a><span class='msg-avail'>...<span class='msg-tooltip'>This code duplicates the (gnu system image) and (gnu build image) code. Using
VM for image generation is not needed, not portable and really slow. Remove
all the VM image generation code to make sure that only the image API is used.

* gnu/build/vm.scm: Remove it. Move the qemu-command procedure to ...
* gnu/build/marionette.scm: ... here.
* gnu/local.mk (GNU_SYSTEM_MODULES): Adapt it.
* tests/modules.scm: Ditto.
* gnu/tests/install.scm: Ditto.
* gnu/system/vm.scm: Adapt it and remove expression-&gt;derivation-in-linux-vm,
qemu-img, system-qemu-image/shared-store and system-docker-image procedures.
* doc/guix.texi (G-Expressions): Adapt it.
</span></span></td><td>Mathieu Othacehe</td></tr>