From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:48189) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFNnb-0004D1-V4 for guix-patches@gnu.org; Tue, 01 Oct 2019 15:27:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iFNna-0001CC-U8 for guix-patches@gnu.org; Tue, 01 Oct 2019 15:27:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54234) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iFNna-0001By-RM for guix-patches@gnu.org; Tue, 01 Oct 2019 15:27:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iFNna-0005px-ND for guix-patches@gnu.org; Tue, 01 Oct 2019 15:27:02 -0400 Subject: bug#37553: [PATCH] inferior: Change to use the (guix repl) module. Resent-To: guix-patches@gnu.org Resent-Message-ID: References: <20190929130128.18484-1-mail@cbaines.net> <20190929155728.27777-1-mail@cbaines.net> <87blv0sv2y.fsf@gnu.org> From: Christopher Baines In-reply-to: <87blv0sv2y.fsf@gnu.org> Date: Tue, 01 Oct 2019 20:26:56 +0100 Message-ID: <87tv8sp8qn.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 37553-done@debbugs.gnu.org --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Ludovic Court=C3=A8s writes: > Hi, > > Christopher Baines skribis: > >> Rather than (guix scripts repl), from which the machine-repl procedure w= as >> removed in [1]. >> >> 1: 92a4087bf4862d5ba9b77111eba3c68c2a1c4679 >> >> * guix/inferior.scm (inferior-pipe): Load (guix repl) rather than (guix >> scripts repl). >> --- >> guix/inferior.scm | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/guix/inferior.scm b/guix/inferior.scm >> index dcbc954432..d6d2053ab8 100644 >> --- a/guix/inferior.scm >> +++ b/guix/inferior.scm >> @@ -136,8 +136,8 @@ it's an old Guix." >> (object->string >> `(begin >> (primitive-load ,(search-path %load-path >> - "guix/scripts/r= epl.scm")) >> - ((@ (guix scripts repl) machine-repl)))))) >> + "guix/repl.scm"= )) >> + ((@ (guix repl) machine-repl)))))) >> pipe))) > > This one LGTM! Great :) I've pushed it as 2cd599f005bb91ae120a66824b8efbac81a27a69. > (Note that this code is only used when spawning an inferior for a > revision that dates back to before =E2=80=98guix repl=E2=80=99 existed, s= o before July > 2018.) Yep, I've been experimenting with loading older revisions in to the Guix Data Service, and this is one of the issues I came across. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAEBCgB9FiEEPonu50WOcg2XVOCyXiijOwuE9XcFAl2TqIBfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcACgkQXiijOwuE 9XcI/w/9HFxjNejrBCeamAcjh9toWbKMUx2jN5JVCthVV0mGlU9MHK7/jpHCht7y 8Mq2lFkkWAVCkDRxXvWDiKCjngTIW6GCzNuRpKD1FgM9IbGalEyOI0rY07OLSqsB 9/l0H9ILEhWdfvH/8Iee3uLfpHQVr5LK+Tt5Bk/714X8w+dwPyopFKoXtDXrB2nz wWYEpsFLY7L0iURKCA3S9jdvJnQ4M5IxyWsWUDgtBZx/390gsepIKfk6g2CLReDV G0rcC6L+wB43IFju/95QcIB6PbR96/uRF4C8bB7OJ1R22N5UZMBLXc7AeCF+RZWv eBYmTIg3CBhAxZM/+F7gjxBpEazOeS+pyWYEa02QmyvFl+18LsJxeWqJANce4IhE jF7lVgAtAaljIoTs1hlnHMrOLwwPGQnfPgjKgAHcTNOTLY++yfLvmInNhm+aBxN4 QZeFBTkrHu3OJyIwVa7WDqzpOcRfFS58K4Q2kQ+qdKRlrjUca5GPsi75b5PI94+R 685wHMRHTq0e0tjgVWi23HsbIxOyNkg/0MJZtsJVo2xHT4q2IUyJJi/wHkxHQMQz hVoL5BNzadvYznoqoA0jNYR7ScCQPL0U281e6Fj66XKONwtrtOJDilBhW10Eupp4 gkx9A/CYvDXLloKhnRKo9VZAjpcEsX+DUnWcAkNK9wPGVJ8wIeU= =MGI8 -----END PGP SIGNATURE----- --=-=-=--