GNU bug report logs - #43426
[PATCH 0/1] Fix unreachable gdsl package

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 43426 in the body.
You can then email your comments to 43426 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: zimoun <zimon.toutoune <at> gmail.com>
To: guix-patches <at> gnu.org
Cc: zimoun <zimon.toutoune <at> gmail.com>, 25913 <at> debbugs.gnu.org
Subject: [PATCH 0/1] Fix unreachable gdsl package
Date: Tue, 15 Sep 2020 16:01:34 +0200

Dear,

The mention of the gna.org closing down is reported in bug #25913
<http://issues.guix.gnu.org/issue/25913>.  Therefore, the package gdsl is not
maintained and the both URLs source and home-page are now unreachable.
Currently, substitutes are available on <ci.guix.gnu.org> but nothing prevents
an unfortunate "guix gc".  This patch uses Software Heritage as an archive for
upstream source, but since tarballs are not yet fully supported by SWH, the
support 'git-fetch' is used instead.

Last, let check the integrity of the switch.

--8<---------------cut here---------------start------------->8---
$ guix time-machine --commit=f6dfe42 -- build gdsl
/gnu/store/yd0vadqjx998v76ynx27klg7i62ra1l1-gdsl-1.8

$ ./pre-inst-env guix build gdsl
/gnu/store/zp18gsfw128aam2ifh9rsfn7wxx1fnzh-gdsl-1.8

$ diff -r --no-dereference \
      /gnu/store/zp18gsfw128aam2ifh9rsfn7wxx1fnzh-gdsl-1.8 \
      /gnu/store/yd0vadqjx998v76ynx27klg7i62ra1l1-gdsl-1.8
diff -r --no-dereference /gnu/store/zp18gsfw128aam2ifh9rsfn7wxx1fnzh-gdsl-1.8/bin/gdsl-config /gnu/store/yd0vadqjx998v76ynx27klg7i62ra1l1-gdsl-1.8/bin/gdsl-config
3c3
< prefix=/gnu/store/zp18gsfw128aam2ifh9rsfn7wxx1fnzh-gdsl-1.8
---
> prefix=/gnu/store/yd0vadqjx998v76ynx27klg7i62ra1l1-gdsl-1.8
diff -r --no-dereference /gnu/store/zp18gsfw128aam2ifh9rsfn7wxx1fnzh-gdsl-1.8/lib/libgdsl.la /gnu/store/yd0vadqjx998v76ynx27klg7i62ra1l1-gdsl-1.8/lib/libgdsl.la
41c41
< libdir='/gnu/store/zp18gsfw128aam2ifh9rsfn7wxx1fnzh-gdsl-1.8/lib'
---
> libdir='/gnu/store/yd0vadqjx998v76ynx27klg7i62ra1l1-gdsl-1.8/lib'
--8<---------------cut here---------------end--------------->8---

zimoun (1):
  gnu: gdsl: Replace 'url-fetch' by 'git-fetch'.

 gnu/packages/datastructures.scm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

-- 
2.28.0

Message #8 received at 43426 <at> debbugs.gnu.org (full text, mbox):

From: zimoun <zimon.toutoune <at> gmail.com>
To: 43426 <at> debbugs.gnu.org
Cc: zimoun <zimon.toutoune <at> gmail.com>
Subject: [PATCH 1/1] gnu: gdsl: Replace 'url-fetch' by 'git-fetch'.
Date: Tue, 15 Sep 2020 16:03:43 +0200

Fixes <https://debbugs.gnu.org/25913>.

* gnu/packages/datastructures.scm (gdsl)[source]: Replace 'url-fetch' by
'git-fetch'.
[home-page]: Update.
---
 gnu/packages/datastructures.scm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/datastructures.scm b/gnu/packages/datastructures.scm
index 3203f91608..ac091500fc 100644
--- a/gnu/packages/datastructures.scm
+++ b/gnu/packages/datastructures.scm
@@ -37,14 +37,15 @@
     (name "gdsl")
     (version "1.8")
     (source (origin
-              (method url-fetch)
-              (uri (string-append "http://download.gna.org/gdsl/"
-                                  "gdsl-" version ".tar.gz"))
+              (method git-fetch)
+              (uri (git-reference
+                    (url "")            ; only hosted on Software Heritage
+                    (commit "6adb53be8b8f9f2e4bbfc92d357eedeefb4c7430")))
               (sha256
                (base32
-                "1v64jvlnj8jfpphphgjgb36p0kv50kwfyqncf0y12f16v8ydyiaw"))))
+                "0a52g12d9sf9hhcyvwfd7xdazj2a9i9jh97cnlqf2ymvwnvjk1g0"))))
     (build-system gnu-build-system)
-    (home-page "http://home.gna.org/gdsl/")
+    (home-page "https://web.archive.org/web/20170502005430/http://home.gna.org/gdsl/")
     (synopsis "Generic data structures library")
     (description "The Generic Data Structures Library (GDSL) is a collection
 of routines for generic data structures manipulation.  It is a re-entrant
-- 
2.28.0

Message #13 received at 43426-done <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: zimoun <zimon.toutoune <at> gmail.com>
Cc: 43426-done <at> debbugs.gnu.org
Subject: Re: [bug#43426] [PATCH 1/1] gnu: gdsl: Replace 'url-fetch' by
 'git-fetch'.
Date: Mon, 21 Sep 2020 23:12:23 +0200

[Message part 1 (text/plain, inline)]

Hi!

zimoun <zimon.toutoune <at> gmail.com> skribis:

> Fixes <https://debbugs.gnu.org/25913>.
>
> * gnu/packages/datastructures.scm (gdsl)[source]: Replace 'url-fetch' by
> 'git-fetch'.
> [home-page]: Update.

Applied with the change below, to avoid the empty URI.

I’ve checked that the content hashes match:

--8<---------------cut here---------------start------------->8---
$ (cd /tmp; tar xf $(guix build -S gdsl); guix hash -r /tmp/gdsl-1.8)
0a52g12d9sf9hhcyvwfd7xdazj2a9i9jh97cnlqf2ymvwnvjk1g0
$ guix hash -r $(./pre-inst-env guix build -S gdsl)
0a52g12d9sf9hhcyvwfd7xdazj2a9i9jh97cnlqf2ymvwnvjk1g0
--8<---------------cut here---------------end--------------->8---

Thanks,
Ludo’.

[Message part 2 (text/x-patch, inline)]

diff --git a/gnu/packages/datastructures.scm b/gnu/packages/datastructures.scm
index ac091500fc..cd4126b22d 100644
--- a/gnu/packages/datastructures.scm
+++ b/gnu/packages/datastructures.scm
@@ -39,8 +39,9 @@
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "")            ; only hosted on Software Heritage
+                    (url "https://example.org") ;only hosted on Software Heritage
                     (commit "6adb53be8b8f9f2e4bbfc92d357eedeefb4c7430")))
+              (file-name (git-file-name name version))
               (sha256
                (base32
                 "0a52g12d9sf9hhcyvwfd7xdazj2a9i9jh97cnlqf2ymvwnvjk1g0"))))

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.