[bug#40684] [PATCH core-updates] guix: self: Use guile with libgc-7.

[bug#40684] [PATCH core-updates] guix: self: Use guile with libgc-7.

[Christopher Baines]

Rather than libgc version 8. This should avoid crashes that can occur,
particularly when loading data in to the Guix Data Service [1].

1: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=40525

* gnu/packages/guile.scm (guile-3.0/libgc-7): New variable.
* guix/self.scm (specification->package): Use guile-3.0/libgc-7 for guile.
---
 gnu/packages/guile.scm | 12 ++++++++++++
 guix/self.scm          |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index 8ccbc22f26..6b7bd492ed 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -309,6 +309,18 @@ without requiring the source code to be rewritten.")
 
 (define-public guile-next guile-3.0)
 
+(define-public guile-3.0/libgc-7
+  (hidden-package
+   (package
+     (inherit guile-3.0)
+     (propagated-inputs
+      (map (lambda (input)
+             (if (string=? (car input)
+                           "bdw-gc")
+                 (list "bdw-gc" libgc-7)
+                 input))
+           (package-propagated-inputs guile-3.0))))))
+
 (define-public guile-3.0/fixed
   ;; A package of Guile that's rarely changed.  It is the one used in the
   ;; `base' module, and thus changing it entails a full rebuild.
diff --git a/guix/self.scm b/guix/self.scm
index 842161400e..905f931aeb 100644
--- a/guix/self.scm
+++ b/guix/self.scm
@@ -48,7 +48,7 @@
   (let ((ref (lambda (module variable)
                (module-ref (resolve-interface module) variable))))
     (match-lambda
-      ("guile"      (ref '(gnu packages guile) 'guile-3.0))
+      ("guile"      (ref '(gnu packages guile) 'guile-3.0/libgc-7))
       ("guile-json" (ref '(gnu packages guile) 'guile-json-3))
       ("guile-ssh"  (ref '(gnu packages ssh)   'guile-ssh))
       ("guile-git"  (ref '(gnu packages guile) 'guile-git))
-- 
2.26.0

[bug#40684] [PATCH core-updates] guix: self: Use guile with libgc-7.

[Ludovic Courtès]

Hi!

Christopher Baines <mail@cbaines.net> skribis:

> Rather than libgc version 8. This should avoid crashes that can occur,
> particularly when loading data in to the Guix Data Service [1].
>
> 1: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=40525
>
> * gnu/packages/guile.scm (guile-3.0/libgc-7): New variable.
> * guix/self.scm (specification->package): Use guile-3.0/libgc-7 for guile.
> ---
>  gnu/packages/guile.scm | 12 ++++++++++++
>  guix/self.scm          |  2 +-
>  2 files changed, 13 insertions(+), 1 deletion(-)
>
> diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
> index 8ccbc22f26..6b7bd492ed 100644
> --- a/gnu/packages/guile.scm
> +++ b/gnu/packages/guile.scm
> @@ -309,6 +309,18 @@ without requiring the source code to be rewritten.")
>  
>  (define-public guile-next guile-3.0)
>  
> +(define-public guile-3.0/libgc-7
> +  (hidden-package
> +   (package
> +     (inherit guile-3.0)
> +     (propagated-inputs
> +      (map (lambda (input)
> +             (if (string=? (car input)
> +                           "bdw-gc")
> +                 (list "bdw-gc" libgc-7)
> +                 input))

Nitpicking: please write it as:

  `(("bdw-gc" ,libgc-7)
    ,@(alist-delete "bdw-gc" (package-propagated-inputs guile-3.0)))

as we do elsewhere.

Also, could you add a comment referencing the bug report, so we
immediately see why this variant exists?

OK with these changes, thanks!

Ludo’.

[bug#40684] [PATCH core-updates] guix: self: Use guile with libgc-7.

[Christopher Baines]

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


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

> Hi!
>
> Christopher Baines <mail@cbaines.net> skribis:
>
>> Rather than libgc version 8. This should avoid crashes that can occur,
>> particularly when loading data in to the Guix Data Service [1].
>>
>> 1: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=40525
>>
>> * gnu/packages/guile.scm (guile-3.0/libgc-7): New variable.
>> * guix/self.scm (specification->package): Use guile-3.0/libgc-7 for guile.
>> ---
>>  gnu/packages/guile.scm | 12 ++++++++++++
>>  guix/self.scm          |  2 +-
>>  2 files changed, 13 insertions(+), 1 deletion(-)
>>
>> diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
>> index 8ccbc22f26..6b7bd492ed 100644
>> --- a/gnu/packages/guile.scm
>> +++ b/gnu/packages/guile.scm
>> @@ -309,6 +309,18 @@ without requiring the source code to be rewritten.")
>>
>>  (define-public guile-next guile-3.0)
>>
>> +(define-public guile-3.0/libgc-7
>> +  (hidden-package
>> +   (package
>> +     (inherit guile-3.0)
>> +     (propagated-inputs
>> +      (map (lambda (input)
>> +             (if (string=? (car input)
>> +                           "bdw-gc")
>> +                 (list "bdw-gc" libgc-7)
>> +                 input))
>
> Nitpicking: please write it as:
>
>   `(("bdw-gc" ,libgc-7)
>     ,@(alist-delete "bdw-gc" (package-propagated-inputs guile-3.0)))
>
> as we do elsewhere.
>
> Also, could you add a comment referencing the bug report, so we
> immediately see why this variant exists?
>
> OK with these changes, thanks!

Sure, I've sent an updated patch now.

Thanks,

Chris

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

bug#40684: [PATCH core-updates] guix: self: Use guile with libgc-7.

[Christopher Baines]

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


Christopher Baines <mail@cbaines.net> writes:

> Sure, I've sent an updated patch now.

I went ahead and pushed this to core-updates earlier as
cef392f3936922b7b0b74bd59be67e660c10db67.

It looks to have had the intended effect, the Guix Data Service was able
to process the commit [1] :D

1: https://guix-patches-data.cbaines.net/revision/cef392f3936922b7b0b74bd59be67e660c10db67

I'll go ahead and mark this bug as done now. Thanks for your help!

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

[bug#40684] [PATCH v2] guix: self: Use guile with libgc-7.

[Christopher Baines]

Rather than libgc version 8. This should avoid crashes that can occur,
particularly when loading data in to the Guix Data Service [1].

1: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=40525

* gnu/packages/guile.scm (guile-3.0/libgc-7): New variable.
* guix/self.scm (specification->package): Use guile-3.0/libgc-7 for guile.
---
 gnu/packages/guile.scm | 11 +++++++++++
 guix/self.scm          |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index 8ccbc22f26..a262553ba1 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -309,6 +309,17 @@ without requiring the source code to be rewritten.")
 
 (define-public guile-next guile-3.0)
 
+(define-public guile-3.0/libgc-7
+  ;; Using libgc-7 avoid crashes that can occur, particularly when loading
+  ;; data in to the Guix Data Service:
+  ;; https://debbugs.gnu.org/cgi/bugreport.cgi?bug=40525
+  (hidden-package
+   (package
+     (inherit guile-3.0)
+     (propagated-inputs
+      `(("bdw-gc" ,libgc-7)
+        ,@(srfi-1:alist-delete "bdw-gc" (package-propagated-inputs guile-3.0)))))))
+
 (define-public guile-3.0/fixed
   ;; A package of Guile that's rarely changed.  It is the one used in the
   ;; `base' module, and thus changing it entails a full rebuild.
diff --git a/guix/self.scm b/guix/self.scm
index 842161400e..905f931aeb 100644
--- a/guix/self.scm
+++ b/guix/self.scm
@@ -48,7 +48,7 @@
   (let ((ref (lambda (module variable)
                (module-ref (resolve-interface module) variable))))
     (match-lambda
-      ("guile"      (ref '(gnu packages guile) 'guile-3.0))
+      ("guile"      (ref '(gnu packages guile) 'guile-3.0/libgc-7))
       ("guile-json" (ref '(gnu packages guile) 'guile-json-3))
       ("guile-ssh"  (ref '(gnu packages ssh)   'guile-ssh))
       ("guile-git"  (ref '(gnu packages guile) 'guile-git))
-- 
2.26.0