[bug#41368] [PATCH] Moved gettext to use git to better conform to better bootstrapping, better integration with Software Heritage, and what looks like emerging best practices for package sources.

[bug#41368] [PATCH] Moved gettext to use git to better conform to better bootstrapping, better integration with Software Heritage, and what looks like emerging best practices for package sources.

[joshua.r.marshall.1991]

From: Josh Marshall <joshua.r.marshall.1991@gmail.com>

---
 gnu/packages/gettext.scm | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/gettext.scm b/gnu/packages/gettext.scm
index 202acf25d4..19920aa210 100644
--- a/gnu/packages/gettext.scm
+++ b/gnu/packages/gettext.scm
@@ -30,6 +30,7 @@
   #:use-module (gnu packages)
   #:use-module (guix packages)
   #:use-module (guix download)
+  #:use-module (guix git-download)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system perl)
   #:use-module (gnu packages docbook)
@@ -46,12 +47,13 @@
     (name "gettext-minimal")
     (version "0.20.1")
     (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://gnu/gettext/gettext-"
-                                  version ".tar.gz"))
+              (method git-fetch)
+              (uri (git-reference
+                     (url "https://git.savannah.gnu.org/git/gettext.git")
+                     (commit (string-append "v" version))))
               (sha256
-               (base32
-                "0p3zwkk27wm2m2ccfqm57nj7vqkmfpn7ja1nf65zmhz8qqs5chb6"))))
+                (base32
+                  "0p3zwkk27wm2m2ccfqm57nj7vqkmfpn7ja1nf65zmhz8qqs5chb6"))))
     (build-system gnu-build-system)
     (outputs '("out"
                "doc"))                            ;9 MiB of HTML
-- 
2.25.1

[bug#41368] [PATCH] Moved gettext to use git to better conform to better bootstrapping, better integration with Software Heritage, and what looks like emerging best practices for package sources.

[Marius Bakke]

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

joshua.r.marshall.1991@gmail.com writes:

> From: Josh Marshall <joshua.r.marshall.1991@gmail.com>

Please add commit messages following the GNU ChangeLog style to your
patches.

I'm surprised that this does not require adding Autoconf etc as
native-inputs, do you know why that is?

Also, won't this cause a circular dependency on 'git-minimal'?  If it
works for you I guess we got lucky in this case.

AIUI the lack of tarball integration in Software Heritage is temporary,
i.e. it will eventually be sorted, and of course back-dated.  So I don't
think we need to move everything to git while we wait for that.

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

[bug#41368] [PATCH] Moved gettext to use git to better conform to better bootstrapping, better integration with Software Heritage, and what looks like emerging best practices for package sources.

[Josh Marshall]

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

On Sun, May 17, 2020, 15:56 Marius Bakke <mbakke@fastmail.com> wrote:

> joshua.r.marshall.1991@gmail.com writes:
>
> > From: Josh Marshall <joshua.r.marshall.1991@gmail.com>
>
> Please add commit messages following the GNU ChangeLog style to your
> patches.
>

How do I do that?  This was in large part an exercise to clean up my
development and contribution practice.

I'm surprised that this does not require adding Autoconf etc as
> native-inputs, do you know why that is?
>

I think I let my environment leak, I'll check into in.

Also, won't this cause a circular dependency on 'git-minimal'?  If it
> works for you I guess we got lucky in this case.
>

I'm not sure.  I'll test more in a little bit.

AIUI the lack of tarball integration in Software Heritage is temporary,
> i.e. it will eventually be sorted, and of course back-dated.  So I don't
> think we need to move everything to git while we wait for that.
>

When I looked into it, there appears to have been no progress in a year and
a half.

>

[-- Attachment #2: Type: text/html, Size: 2479 bytes --]

[bug#41368] [PATCH] Moved gettext to use git to better conform to better bootstrapping, better integration with Software Heritage, and what looks like emerging best practices for package sources.

[Marius Bakke]

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

Josh Marshall <joshua.r.marshall.1991@gmail.com> writes:

> On Sun, May 17, 2020, 15:56 Marius Bakke <mbakke@fastmail.com> wrote:
>
>> joshua.r.marshall.1991@gmail.com writes:
>>
>> > From: Josh Marshall <joshua.r.marshall.1991@gmail.com>
>>
>> Please add commit messages following the GNU ChangeLog style to your
>> patches.
>>
>
> How do I do that?  This was in large part an exercise to clean up my
> development and contribution practice.

When doing 'git commit', add a one-line "title" for your change and
mention the changed files and variables in the commit message "body".

See the git log for examples.

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

[bug#41368] [PATCH] Moved gettext to use git to better conform to better bootstrapping, better integration with Software Heritage, and what looks like emerging best practices for package sources.

[Leo Famulari]

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

On Sun, May 17, 2020 at 04:30:52PM -0400, Josh Marshall wrote:
> Subject: Moved gettext to use git to better conform to better
> bootstrapping, better integration with Software Heritage, and what looks
> like emerging best practices for package sources.

Based on the previous discussion of this topic [0], I don't think there
was a consensus about whether or not using tarballs or Git sources was
better.

[0] https://lists.gnu.org/archive/html/guix-devel/2020-05/msg00224.html

> On Sun, May 17, 2020, 15:56 Marius Bakke <mbakke@fastmail.com> wrote:
> > joshua.r.marshall.1991@gmail.com writes:
> AIUI the lack of tarball integration in Software Heritage is temporary,
> > i.e. it will eventually be sorted, and of course back-dated.  So I don't
> > think we need to move everything to git while we wait for that.
> 
> When I looked into it, there appears to have been no progress in a year and
> a half.

Software Heritage is a cool project, but I don't see it as a reason to
start changing our packages yet. For one thing, it hasn't demonstrated
long-term stability in the way that the GNU tarball servers have. And
the apparent lack of progress on this feature (tarball hosting) does not
make me more confident.

There's no reason to avoid SWH, but also no reason to move away from
tarballs where we are already using them. I don't think there is any
danger of losing the gettext source code the way that there is for minor
GitHub projects and scientific computing packages.

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

[bug#41368] [PATCH] Moved gettext to use git to better conform to better bootstrapping, better integration with Software Heritage, and what looks like emerging best practices for package sources.

[zimoun]

Hi,

On Sun, 17 May 2020 at 16:30, Josh Marshall <joshua.r.marshall.1991@gmail.com> wrote:

>  I'm surprised that this does not require adding Autoconf etc as
>  native-inputs, do you know why that is?
>
> I think I let my environment leak, I'll check into in.

Did you check?


>>  Also, won't this cause a circular dependency on 'git-minimal'?  If it
>>  works for you I guess we got lucky in this case.
>
> I'm not sure.  I'll test more in a little bit.

How the tests are going?


> When I looked into it, there appears to have been no progress in a year and a half.

No progress in a year and half, maybe it is an exaggeration.  For
example the ’sources.json’ format which allows SWH to ingest all the
tarballs had been cooked over this year and implemented less than 6
months ago:

        87884f2de25559fca11892187953261cee8224ef
        AuthorDate: Mon Feb 10 17:52:13 2020 +0100
        CommitDate: Mon Mar 9 10:50:30 2020 +0100
        [..]
        35bb77108fc7f2339da0b5be139043a5f3f21493
        AuthorDate: Mon Jun 29 18:50:57 2020 +0200
        CommitDate: Mon Jul 6 12:19:32 2020 +0200

Even, the ingestion by SWH at the production level (not the
testing/staging level) dates from Sept. 15th.

  <http://logs.guix.gnu.org/guix/2020-09-15.log#172530>


Be patient. :-)
The work is in progress… but for sure, it is not a priority of the SWH
side.  Well, I am aligned with the Marius and Leo’s words. :-)


All the best,
simon