[PATCH] inferior: Change to using guix-repl.

DoneSubmitted by Christopher Baines.
Details
2 participants
  • Ludovic Courtès
  • Christopher Baines
Owner
unassigned
Severity
normal
C
C
Christopher Baines wrote on 29 Sep 2019 15:01
(address . guix-patches@gnu.org)
20190929130128.18484-1-mail@cbaines.net
Rather than machine-repl, that was removed in [1]. While this could work ifthe %load-path is such that a module that defines machine-repl is loaded, Ibelieve the intent is that the (guix scripts repl) module comes from the Guixmanaging the inferior. Therefore, matching the changes in [1], switch tocalling the guix-repl function with the right arguments.
1: 92a4087bf4862d5ba9b77111eba3c68c2a1c4679
* guix/inferior.scm (inferior-pipe): Call guix-repl, rather than machine-repl,and add necessary arguments.--- guix/inferior.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
Toggle diff (16 lines)diff --git a/guix/inferior.scm b/guix/inferior.scmindex dcbc954432..7c0143062b 100644--- a/guix/inferior.scm+++ b/guix/inferior.scm@@ -137,7 +137,8 @@ it's an old Guix." `(begin (primitive-load ,(search-path %load-path "guix/scripts/repl.scm"))- ((@ (guix scripts repl) machine-repl))))))+ ((@ (guix scripts repl) guix-repl)+ "-t" "machine"))))) pipe))) (define* (port->inferior pipe #:optional (close close-port))-- 2.23.0
C
C
Christopher Baines wrote on 29 Sep 2019 17:20
[PATCH] inferior: Change to use the (guix repl) module.
(address . 37553@debbugs.gnu.org)
20190929152004.20467-1-mail@cbaines.net
Rather than (guix scripts repl), from which the machine-repl procedure wasremoved in [1].
1: 92a4087bf4862d5ba9b77111eba3c68c2a1c4679
* guix/inferior.scm (inferior-pipe): Load (guix repl) rather than (guixscripts repl).--- guix/inferior.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Toggle diff (15 lines)diff --git a/guix/inferior.scm b/guix/inferior.scmindex dcbc954432..dcffb7b4ab 100644--- a/guix/inferior.scm+++ b/guix/inferior.scm@@ -137,7 +137,7 @@ it's an old Guix." `(begin (primitive-load ,(search-path %load-path "guix/scripts/repl.scm"))- ((@ (guix scripts repl) machine-repl))))))+ ((@ (guix repl) machine-repl)))))) pipe))) (define* (port->inferior pipe #:optional (close close-port))-- 2.23.0
C
C
Christopher Baines wrote on 29 Sep 2019 17:57
(address . 37553@debbugs.gnu.org)
20190929155728.27777-1-mail@cbaines.net
Rather than (guix scripts repl), from which the machine-repl procedure wasremoved in [1].
1: 92a4087bf4862d5ba9b77111eba3c68c2a1c4679
* guix/inferior.scm (inferior-pipe): Load (guix repl) rather than (guixscripts repl).--- guix/inferior.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Toggle diff (17 lines)diff --git a/guix/inferior.scm b/guix/inferior.scmindex 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/repl.scm"))- ((@ (guix scripts repl) machine-repl))))))+ "guix/repl.scm"))+ ((@ (guix repl) machine-repl)))))) pipe))) (define* (port->inferior pipe #:optional (close close-port))-- 2.23.0
L
L
Ludovic Courtès wrote on 1 Oct 2019 10:56
(name . Christopher Baines)(address . mail@cbaines.net)(address . 37553@debbugs.gnu.org)
87blv0sv2y.fsf@gnu.org
Hi,
Christopher Baines <mail@cbaines.net> skribis:
Toggle quote (25 lines)> Rather than (guix scripts repl), from which the machine-repl procedure was> 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/repl.scm"))> - ((@ (guix scripts repl) machine-repl))))))> + "guix/repl.scm"))> + ((@ (guix repl) machine-repl))))))> pipe)))
This one LGTM!
(Note that this code is only used when spawning an inferior for arevision that dates back to before ‘guix repl’ existed, so before July2018.)
Thanks,Ludo’.
C
C
Christopher Baines wrote on 1 Oct 2019 21:26
(name . Ludovic Courtès)(address . ludo@gnu.org)(address . 37553-done@debbugs.gnu.org)
87tv8sp8qn.fsf@cbaines.net
Ludovic Courtès <ludo@gnu.org> writes:
Toggle quote (31 lines)> Hi,>> Christopher Baines <mail@cbaines.net> skribis:>>> Rather than (guix scripts repl), from which the machine-repl procedure was>> 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/repl.scm"))>> - ((@ (guix scripts repl) machine-repl))))))>> + "guix/repl.scm"))>> + ((@ (guix repl) machine-repl))))))>> pipe)))>> This one LGTM!
Great :) I've pushed it as 2cd599f005bb91ae120a66824b8efbac81a27a69.
Toggle quote (4 lines)> (Note that this code is only used when spawning an inferior for a> revision that dates back to before ‘guix repl’ existed, so before July> 2018.)
Yep, I've been experimenting with loading older revisions in to the GuixData Service, and this is one of the issues I came across.
-----BEGIN PGP SIGNATURE-----
iQKTBAEBCgB9FiEEPonu50WOcg2XVOCyXiijOwuE9XcFAl2TqIBfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNFODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcACgkQXiijOwuE9XcI/w/9HFxjNejrBCeamAcjh9toWbKMUx2jN5JVCthVV0mGlU9MHK7/jpHCht7y8Mq2lFkkWAVCkDRxXvWDiKCjngTIW6GCzNuRpKD1FgM9IbGalEyOI0rY07OLSqsB9/l0H9ILEhWdfvH/8Iee3uLfpHQVr5LK+Tt5Bk/714X8w+dwPyopFKoXtDXrB2nzwWYEpsFLY7L0iURKCA3S9jdvJnQ4M5IxyWsWUDgtBZx/390gsepIKfk6g2CLReDVG0rcC6L+wB43IFju/95QcIB6PbR96/uRF4C8bB7OJ1R22N5UZMBLXc7AeCF+RZWveBYmTIg3CBhAxZM/+F7gjxBpEazOeS+pyWYEa02QmyvFl+18LsJxeWqJANce4IhEjF7lVgAtAaljIoTs1hlnHMrOLwwPGQnfPgjKgAHcTNOTLY++yfLvmInNhm+aBxN4QZeFBTkrHu3OJyIwVa7WDqzpOcRfFS58K4Q2kQ+qdKRlrjUca5GPsi75b5PI94+R685wHMRHTq0e0tjgVWi23HsbIxOyNkg/0MJZtsJVo2xHT4q2IUyJJi/wHkxHQMQzhVoL5BNzadvYznoqoA0jNYR7ScCQPL0U281e6Fj66XKONwtrtOJDilBhW10Eupp4gkx9A/CYvDXLloKhnRKo9VZAjpcEsX+DUnWcAkNK9wPGVJ8wIeU==MGI8-----END PGP SIGNATURE-----
Closed
L
L
Ludovic Courtès wrote on 2 Oct 2019 11:30
(name . Christopher Baines)(address . mail@cbaines.net)(address . 37553-done@debbugs.gnu.org)
87imp7jy01.fsf@gnu.org
Hi,
Christopher Baines <mail@cbaines.net> skribis:
Toggle quote (3 lines)> 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.
Nice! I’ve been thinking we should have time-traveling continuousintegration. Like checking that we can build some Guix revision of thepast in between two ‘core-updates’ merges.
It would also be useful to flag known-bad revisions, but in a way theData Service is already doing that for recent revisions.
Thanks,Ludo’.
Closed
C
C
Christopher Baines wrote on 6 Oct 2019 10:46
(name . Ludovic Courtès)(address . ludo@gnu.org)(address . 37553-done@debbugs.gnu.org)
874l0mp8gs.fsf@cbaines.net
Ludovic Courtès <ludo@gnu.org> writes:
Toggle quote (14 lines)> Hi,>> Christopher Baines <mail@cbaines.net> skribis:>>> 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.>> Nice! I’ve been thinking we should have time-traveling continuous> integration. Like checking that we can build some Guix revision of the> past in between two ‘core-updates’ merges.>> It would also be useful to flag known-bad revisions, but in a way the> Data Service is already doing that for recent revisions.
So I've been looking at retrying failed jobs in the Guix Data Service,there are a few where it's just networking issues talking to Savannah.
I guess it could be useful to have a list of revisions which can't beused through guix pull or a channel, and that information could also beused in the Guix Data Service.
-----BEGIN PGP SIGNATURE-----
iQKTBAEBCgB9FiEEPonu50WOcg2XVOCyXiijOwuE9XcFAl2ZqeNfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNFODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcACgkQXiijOwuE9XcVOhAAoas3ntAK+6MPBDvjYTeIgjBrkJUarpDi7gM8VdBXWXcSqNstv/yHSb4amWvxaGgZcaCxpRRf4aJ36gzkJUxNNAe0oNmgxg11jR4tCpFUcrXlLibonfrBoquo23Edrbf4uWSt/E1UEqoIc6NEewLJv9reU/iBQe0bSL2Y4LdKiI8DIiqH7ZwlJ8UH1KRundvLavJ2mW772p1uwF2vI1/mBE9Orgu8/Y8qJK/GuzG03Ypx3mUKm706i8RPMlY3nx2XgHqxdjvVneah/ChW2XFNgQ2NV4kkpvC6XDYOd1zUGf3MPw3YruOW3c+HWVggb0rDJr5sUdYfmgHoqQHhHD+aGIf/URxtSZA4smvy1H7BOtC1o5MdGqtNPXGFDWa1Kl1gVyp90xoZFu0QHmqrpZfi64YEbElVNpAVjC4kQc3R7RBVQRyqbArCe6gss+eRG0KS5HsMmFsnzAoN97QEi0nbw2kpBLFL9PbEWrDS4gOB131DSK9/1n+uxdicNNwCelsSNZyOuzBghiSJeeTEvz29OsKIQdwIDNauAkBMtxA24l4dOvjp4eNeofg6ywOyo+5/a1IbX/ddbOEnZV29JgpUXwcRRCWqlD/oZth3i4UQiBES+27PKu8n69Ar6UV6+5RPoovvHHrLbaPQbPfHZWtsf84xg4a8S/vNCrmLGs9xq6w==6Gxi-----END PGP SIGNATURE-----
Closed
L
L
Ludovic Courtès wrote on 6 Oct 2019 10:58
(name . Christopher Baines)(address . mail@cbaines.net)(address . 37553-done@debbugs.gnu.org)
87y2xygsig.fsf@gnu.org
Hi Chris,
Christopher Baines <mail@cbaines.net> skribis:
Toggle quote (19 lines)> Ludovic Courtès <ludo@gnu.org> writes:>>> Hi,>>>> Christopher Baines <mail@cbaines.net> skribis:>>>>> 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.>>>> Nice! I’ve been thinking we should have time-traveling continuous>> integration. Like checking that we can build some Guix revision of the>> past in between two ‘core-updates’ merges.>>>> It would also be useful to flag known-bad revisions, but in a way the>> Data Service is already doing that for recent revisions.>> So I've been looking at retrying failed jobs in the Guix Data Service,> there are a few where it's just networking issues talking to Savannah.
Cool.
Toggle quote (4 lines)> I guess it could be useful to have a list of revisions which can't be> used through guix pull or a channel, and that information could also be> used in the Guix Data Service.
Yes, thanks for looking into it!
Ludo’.
Closed
?
Your comment

This issue is archived.

To comment on this conversation send email to 37553@debbugs.gnu.org