bug#44452: Clash between guile-3.0 and guile-3.0-latest

[divoplade <d@divoplade.fr>]

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

Le mercredi 04 novembre 2020 à 21:15 +0100, zimoun a écrit :
> > The fix would be to deprecate guile-3.0-latest as an alias for
> > guile-
> > 3.0, and use the 3.0.4 version in guile-3.0.
> 
> I have not checked, but this proposal could lead to a world rebuild.

With this fix, yes, it leads to a world rebuild, but it was marked in a
TODO anyway. I don't know if it fully solves the problem just yet,
because I'm downloading 400MB of world rebuilding with my connection at
180 KB/s, but I have good hopes!

Best regards,

divoplade

[-- Attachment #2: 0001-gnu-upgrade-guile-to-3.0.4.patch --]
[-- Type: text/x-patch, Size: 2081 bytes --]

From 42e2d64533c018a61db8408b5ae22312b210f7cc Mon Sep 17 00:00:00 2001
From: divoplade <d@divoplade.fr>
Date: Thu, 5 Nov 2020 08:25:46 +0100
Subject: [PATCH] gnu: upgrade guile to 3.0.4

It is impossible to have guile-3.0 installed as a package in the system
configuration, because it is incompatible with guile-3.0-latest which is used
by the system (see bug 44452). By having the same version, it works.
---
 gnu/packages/guile.scm | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index 6d93d7432f..ff943dd6de 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -284,14 +284,14 @@ without requiring the source code to be rewritten.")
   (package
     (inherit guile-2.2)
     (name "guile")
-    (version "3.0.2")
+    (version "3.0.4")
     (source (origin
               (inherit (package-source guile-2.2))
               (uri (string-append "mirror://gnu/guile/guile-"
                                   version ".tar.xz"))
               (sha256
                (base32
-                "12lziar4j27j9whqp2n18427q45y9ghq7gdd8lqhmj1k0lr7vi2k"))))
+                "0c8dkyvs6xbxp7rgnhkyakajzhakay7qn9kahj1mj49x5vf4fybb"))))
     (arguments
      ;; XXX: JIT-enabled Guile crashes in obscure ways on GNU/Hurd.
      (if (hurd-target?)
@@ -309,17 +309,7 @@ without requiring the source code to be rewritten.")
                      "share/guile/site/3.0")))))))
 
 (define-public guile-3.0-latest
-  ;; TODO: Make this 'guile-3.0' on the next rebuild cycle.
-  (package
-    (inherit guile-3.0)
-    (version "3.0.4")
-    (source (origin
-              (inherit (package-source guile-3.0))
-              (uri (string-append "mirror://gnu/guile/guile-"
-                                  version ".tar.xz"))
-              (sha256
-               (base32
-                "0c8dkyvs6xbxp7rgnhkyakajzhakay7qn9kahj1mj49x5vf4fybb"))))))
+  (deprecated-package "guile-3.0-latest" guile-3.0))
 
 (define-public guile-next
   (deprecated-package "guile-next" guile-3.0))
-- 
2.29.2