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

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

[Christopher Baines]

Rather than machine-repl, that was removed in [1]. While this could work if
the %load-path is such that a module that defines machine-repl is loaded, I
believe the intent is that the (guix scripts repl) module comes from the Guix
managing the inferior. Therefore, matching the changes in [1], switch to
calling 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(-)

diff --git a/guix/inferior.scm b/guix/inferior.scm
index 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

[bug#37553] [PATCH] inferior: Change to use the (guix repl) module.

[Christopher Baines]

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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guix/inferior.scm b/guix/inferior.scm
index 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

[bug#37553] [PATCH] inferior: Change to use the (guix repl) module.

[Christopher Baines]

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)))
 
 (define* (port->inferior pipe #:optional (close close-port))
-- 
2.23.0

[bug#37553] [PATCH] inferior: Change to use the (guix repl) module.

[Ludovic Courtès]

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!

(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.)

Thanks,
Ludo’.

bug#37553: [PATCH] inferior: Change to use the (guix repl) module.

[Christopher Baines]

[-- Attachment #1: Type: text/plain, Size: 1513 bytes --]

Ludovic Courtès <ludo@gnu.org> writes:

> 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.

> (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 Guix
Data Service, and this is one of the issues I came across.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 962 bytes --]

[bug#37553] [PATCH] inferior: Change to use the (guix repl) module.

[Ludovic Courtès]

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.

Thanks,
Ludo’.

[bug#37553] [PATCH] inferior: Change to use the (guix repl) module.

[Christopher Baines]

[-- Attachment #1: Type: text/plain, Size: 908 bytes --]


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.

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.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 962 bytes --]

[bug#37553] [PATCH] inferior: Change to use the (guix repl) module.

[Ludovic Courtès]

Hi Chris,

Christopher Baines <mail@cbaines.net> skribis:

> 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.

> 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’.