bug#25913: metabug: move gna.org packages to new upstream locations

bug#25913: metabug: move gna.org packages to new upstream locations

[ng0]

As you might have noticed (or not), gna.org is closing down soon.

Read http://gna.org/forum/forum.php?forum_id=2545 for more on the
subject.

So we need to move yet another bunch of packages to where ever they moved
now. The sources I mean. And maybe notify upstream in case you feel like
it.

I will open this as a bug so that it can be closed once it is done.
Please close this bug once all packages have been moved.


Packages are few in number:

[user@abyayala ~/src/guix/guix]$ egrep -nr "gna.org" gnu/packages
gnu/packages/guile.scm:1289:                    "http://download.gna.org/guile-dbi/guile-dbi-"
gnu/packages/guile.scm:1312:    (home-page "http://home.gna.org/guile-dbi/guile-dbi.html")
gnu/packages/guile.scm:1327:                    "http://download.gna.org/guile-dbi/guile-dbd-sqlite3-"
gnu/packages/datastructures.scm:33:              (uri (string-append "http://download.gna.org/gdsl/"
gnu/packages/datastructures.scm:39:    (home-page "http://home.gna.org/gdsl/")
gnu/packages/game-development.scm:324:              (uri (string-append "http://download.gna.org/allegro/allegro/"
gnu/packages/game-development.scm:362:              (uri (string-append "http://download.gna.org/allegro/allegro/"
gnu/packages/game-development.scm:402:              (uri (string-append "http://download.gna.org/allegro/allegro/"
gnu/packages/games.scm:3178:           "http://download.gna.org/freeciv/"
gnu/packages/gtk.scm:735:                   "http://download.gna.org/guile-cairo/guile-cairo-"

Thanks!

bug#25913: Bug #25913 Hunting: gna.org down: gdsl, guile-dbi impacted

[zimoun]

Dear,

Currently the packages "gdsl" and "guile-dbi" are still downloading
from gna.org.

--8<---------------cut here---------------end--------------->8---
$ egrep -nr "gna.org" gnu/packages/*.scm
gnu/packages/datastructures.scm:38:              (uri (string-append
"http://download.gna.org/gdsl/"
gnu/packages/datastructures.scm:44:    (home-page "http://home.gna.org/gdsl/")
gnu/packages/guile-xyz.scm:1096:
"http://download.gna.org/guile-dbi/guile-dbi-"
gnu/packages/guile-xyz.scm:1127:    (home-page
"http://home.gna.org/guile-dbi/guile-dbi.html")
gnu/packages/guile-xyz.scm:1151:
"http://download.gna.org/guile-dbi/guile-dbd-sqlite3-"
--8<---------------cut here---------------end--------------->8---


The source is stored in our server.

--8<---------------cut here---------------end--------------->8---
Starting download of /gnu/store/nw1wfwcds5aylz5wji0ibm3jig1zykw1-gdsl-1.8.tar.gz
From http://download.gna.org/gdsl/gdsl-1.8.tar.gz...
download failed "http://download.gna.org/gdsl/gdsl-1.8.tar.gz" 404 "Not Found"

Starting download of /gnu/store/nw1wfwcds5aylz5wji0ibm3jig1zykw1-gdsl-1.8.tar.gz
From https://ci.guix.gnu.org/file/gdsl-1.8.tar.gz/sha256/1v64jvlnj8jfpphphgjgb36p0kv50kwfyqncf0y12f16v8ydyiaw...
downloading from
https://ci.guix.gnu.org/file/gdsl-1.8.tar.gz/sha256/1v64jvlnj8jfpphphgjgb36p0kv50kwfyqncf0y12f16v8ydyiaw...
--8<---------------cut here---------------end--------------->8---


I am not user of gdsl so I do not know if there is another location.
Ricardo? As you added it (2016), do you know?

Christopher, you have recently updated "guile-dbi", do you know
another location?


In both case, I propose to place them in any Gitlab or Github
location. What do you think?


All the best,
simon

[bug#43426] [PATCH 0/1] Fix unreachable gdsl package

[zimoun]

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

[bug#43426] [PATCH 1/1] gnu: gdsl: Replace 'url-fetch' by 'git-fetch'.

[zimoun]

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

bug#25913: [PATCH 0/1] Fix unreachable gdsl package

[zimoun]

On Tue, 15 Sep 2020 at 16:01, zimoun <zimon.toutoune@gmail.com> wrote:

> $ 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'
>
> zimoun (1):
>   gnu: gdsl: Replace 'url-fetch' by 'git-fetch'.
>
>  gnu/packages/datastructures.scm | 11 ++++++-----
>  1 file changed, 6 insertions(+), 5 deletions(-)

The patch is in <http://issues.guix.gnu.org/issue/43426>.

bug#43426: [PATCH 1/1] gnu: gdsl: Replace 'url-fetch' by 'git-fetch'.

[Ludovic Courtès]

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

Hi!

zimoun <zimon.toutoune@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’.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-patch, Size: 712 bytes --]

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"))))