Received: (at 70169) by debbugs.gnu.org; 8 Apr 2024 12:15:22 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Mon Apr 08 08:15:22 2024 Received: from localhost ([127.0.0.1]:45502 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rtnuD-0001bo-4Q for submit <at> debbugs.gnu.org; Mon, 08 Apr 2024 08:15:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52260) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <ludo@HIDDEN>) id 1rtnu8-0001Gk-Am for 70169 <at> debbugs.gnu.org; Mon, 08 Apr 2024 08:15:19 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <ludo@HIDDEN>) id 1rtntu-0005ti-L5; Mon, 08 Apr 2024 08:15:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=Z6m6NWLzA3aiptZoFqo63FG4yy5G/ncyPW04vnIPjiA=; b=iRxojUmhXTSc4FqLoLU4 +8EI5MOmmbNPtrbnqzQcO9n/+b+oRYhrrT+jH4EmmfQgX1cUXlBaUNR0SDV9L93xPL5LnKirzBQ/t cZ6VeAR49eN54IW1G5HvuVYk+hM3NrXlevda+aFbUnWlwySMvIilAa/MqwZm9OMRVY22mOhTmbJy6 uU1dASkwZxQ9XcT1E+gP0yqTTVul2FAlZhrbbTHYuPO5EVglw3w3R2Cfs3wz9tsAj1qRodOb0XviU +slYTYLRSAc9ytVBo76CRDtp9YLE5Or0eYN3ij2rOyHHhNJmi88/EA5XclXkag0RgWbitDCuI/0td g5xmjgMaQFOuNA==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= <ludo@HIDDEN> To: Janneke Nieuwenhuizen <janneke@HIDDEN> Subject: Re: [bug#70169] [PATCH v2 13/12] doc: Use "dejavu sans" instead of "Helvetica" or "sans" in dot images. In-Reply-To: <87msq5im7s.fsf@HIDDEN> (Janneke Nieuwenhuizen's message of "Sun, 07 Apr 2024 10:57:43 +0200") References: <cover.1712437365.git.janneke@HIDDEN> <87msq5im7s.fsf@HIDDEN> Date: Mon, 08 Apr 2024 14:15:00 +0200 Message-ID: <87v84sqce3.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 70169 Cc: 70169 <at> debbugs.gnu.org X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -3.3 (---) Janneke Nieuwenhuizen <janneke@HIDDEN> skribis: > Janneke Nieuwenhuizen writes: > >> Note that you'll need an environment with something like >> >> guix shell -CP -m manifest.scm fontconfig font-ghostscript graphviz \ >> imagemagick texlive-bin > > Headsup: using the attached bonus patch the tarball reproduces for me > also without using a container, i.e., building it in > > guix shell -CP -m manifest.scm fontconfig graphviz imagemagick texliv= e-bin > > or > > guix shell -m manifest.scm fontconfig graphviz imagemagick texlive-bin > > now creates the same tarball for me. Ah yes, I had: --8<---------------cut here---------------start------------->8--- /bin/sh '/home/ludo/src/guix/build-aux/missing' dot -Tpng -Gratio=3D.9 -Gno= desep=3D.005 -Granksep=3D.00005 -Nfontsize=3D9 -Nheight=3D.1 -Nwidth=3D.1 <= "doc/images/bootstrap-graph.dot" > "./doc/images/bootstrap-graph.png.tmp" Error: fontconfig: Didn't find expected font family. Perhaps URW Type 1 fon= ts need installing? Error: fontconfig: Didn't find expected font family. Perhaps URW Type 1 fon= ts need installing? Error: fontconfig: Didn't find expected font family. Perhaps URW Type 1 fon= ts need installing? Error: fontconfig: Didn't find expected font family. Perhaps URW Type 1 fon= ts need installing? Error: fontconfig: Didn't find expected font family. Perhaps URW Type 1 fon= ts need installing? Error: fontconfig: Didn't find expected font family. Perhaps URW Type 1 fon= ts need installing? Error: fontconfig: Didn't find expected font family. Perhaps URW Type 1 fon= ts need installing? Error: fontconfig: Didn't find expected font family. Perhaps URW Type 1 fon= ts need installing? Error: fontconfig: Didn't find expected font family. Perhaps URW Type 1 fon= ts need installing? Error: fontconfig: Didn't find expected font family. Perhaps URW Type 1 fon= ts need installing? Error: fontconfig: Didn't find expected font family. Perhaps URW Type 1 fon= ts need installing? Error: fontconfig: Didn't find expected font family. Perhaps URW Type 1 fon= ts need installing? Error: fontconfig: Didn't find expected font family. Perhaps URW Type 1 fon= ts need installing? Error: fontconfig: Didn't find expected font family. Perhaps URW Type 1 fon= ts need installing? Error: fontconfig: Didn't find expected font family. Perhaps URW Type 1 fon= ts need installing? Error: fontconfig: Didn't find expected font family. Perhaps URW Type 1 fon= ts need installing? Error: fontconfig: Didn't find expected font family. Perhaps URW Type 1 fon= ts need installing? Error: fontconfig: Didn't find expected font family. Perhaps URW Type 1 fon= ts need installing? Error: fontconfig: Didn't find expected font family. Perhaps URW Type 1 fon= ts need installing? Error: fontconfig: Didn't find expected font family. Perhaps URW Type 1 fon= ts need installing? Error: fontconfig: Didn't find expected font family. Perhaps URW Type 1 fon= ts need installing? Error: fontconfig: Didn't find expected font family. Perhaps URW Type 1 fon= ts need installing? Error: fontconfig: Didn't find expected font family. Perhaps URW Type 1 fon= ts need installing? Error: fontconfig: Didn't find expected font family. Perhaps URW Type 1 fon= ts need installing? Error: fontconfig: Didn't find expected font family. Perhaps URW Type 1 fon= ts need installing? Error: fontconfig: Didn't find expected font family. Perhaps URW Type 1 fon= ts need installing? make[2]: *** [Makefile:7321: doc/images/bootstrap-graph.png] Error 1 --8<---------------cut here---------------end--------------->8--- >>From 83287968f06487fa907ef3575cef331b415350c7 Mon Sep 17 00:00:00 2001 > Message-ID: <83287968f06487fa907ef3575cef331b415350c7.1712479964.git.jann= eke@HIDDEN> > In-Reply-To: <cover.1712479964.git.janneke@HIDDEN> > References: <cover.1712479964.git.janneke@HIDDEN> > From: Janneke Nieuwenhuizen <janneke@HIDDEN> > Date: Sun, 7 Apr 2024 10:03:06 +0200 > Subject: [PATCH v2 13/12] doc: Use "dejavu sans" instead of "Helvetica" or > "sans" in dot images. > > Font-dejavu is (now) an input of fontconfig. Specifying "dejavu sans" ma= kes > generated images reproducible even when other fonts are installed (notably > font-google-noto). > > * doc/images/bootstrap-graph.dot, > doc/images/bootstrap-packages.dot, > doc/images/coreutils-bag-graph.dot, > doc/images/coreutils-graph.dot, > doc/images/gcc-core-mesboot0-graph.dot, > doc/images/service-graph.dot, > doc/images/shepherd-graph.dot: Use fontname =3D "dejavu sans". > * doc/guix.texi (Full-Source Bootstrap): Update gcc-core-mesboot0.dot rec= ipe > accordingly. > > Change-Id: If21d7d39d45c66de5bceafb7b825a057d540ee50 I installed this patch but got: --8<---------------cut here---------------start------------->8--- $ make dist -j4 V=3D1 Makefile:7391: warning: overriding recipe for target 'doc/stamp-vti' Makefile:5105: warning: ignoring old recipe for target 'doc/stamp-vti' Makefile:7392: warning: overriding recipe for target 'doc/stamp-1' Makefile:5170: warning: ignoring old recipe for target 'doc/stamp-1' Makefile:7392: warning: overriding recipe for target 'doc/stamp-2' Makefile:5235: warning: ignoring old recipe for target 'doc/stamp-2' Makefile:7392: warning: overriding recipe for target 'doc/stamp-3' Makefile:5300: warning: ignoring old recipe for target 'doc/stamp-3' Makefile:7392: warning: overriding recipe for target 'doc/stamp-4' Makefile:5365: warning: ignoring old recipe for target 'doc/stamp-4' Makefile:7392: warning: overriding recipe for target 'doc/stamp-5' Makefile:5430: warning: ignoring old recipe for target 'doc/stamp-5' Makefile:7392: warning: overriding recipe for target 'doc/stamp-6' Makefile:5495: warning: ignoring old recipe for target 'doc/stamp-6' Makefile:7484: Autotools cache out of date. Autotools cache version: 1.3.0.57430-933766. Git version: 1.3.0.57431-732eb8. Please run `autoreconf -vif'. Makefile:7489: *** Cannot create reproducible tarball. Stop. --8<---------------cut here---------------end--------------->8--- Same story after running =E2=80=98autoreconf -vfi=E2=80=99, not sure why. Ludo=E2=80=99.
guix-patches@HIDDEN:bug#70169; Package guix-patches.
Full text available.
Received: (at 70169) by debbugs.gnu.org; 8 Apr 2024 09:41:29 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Mon Apr 08 05:41:28 2024
Received: from localhost ([127.0.0.1]:45302 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rtlVI-0003I1-Hu
for submit <at> debbugs.gnu.org; Mon, 08 Apr 2024 05:41:28 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:57898)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <ludo@HIDDEN>) id 1rtlVG-0003He-Gs
for 70169 <at> debbugs.gnu.org; Mon, 08 Apr 2024 05:41:27 -0400
Received: from fencepost.gnu.org ([2001:470:142:3::e])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <ludo@HIDDEN>)
id 1rtlV3-0004c5-Sp; Mon, 08 Apr 2024 05:41:13 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To:
From; bh=Zp+/VEXQqjBsw/TiwbvwjnRfGoPEvSPo7PAI6h4Urlo=; b=mQ4bosQuNflK79Qcm/Dr
A3U7jVGgJlPecvjIHr5M9oQcOIJqJ0kzXy/8jgRrAf+p6XA1agGlDwdKb2WYP1wyIMgjwJ+vIONUY
tCGiJ06qVEuyZ4m8tiYCBqFaj9pZ5+a5DhMxTbvqKvZTgLvwbPLsUS9mRTEAPOcGY0IK1DPYwCJIR
yLbOs0RY5sQIqHFS8AmeEeIrBSK4NSwnya1sVNSSDvcmwnPT6y8aXBVIBmMLlrQl+o2FhMiSPQq1A
g1aSpmY7wQQj2w5rLSqZcl3A5LlF6RWYotNnelzG3il0794YGaJ86U/aSgjsp32TyKlryUxUgOcEB
jjuyV6W15dy9+g==;
From: =?utf-8?Q?Ludovic_Court=C3=A8s?= <ludo@HIDDEN>
To: Janneke Nieuwenhuizen <janneke@HIDDEN>
Subject: Re: [bug#70169] [PATCH v2 09/12] maint: Remove %%CreationDate from
generated EPS files
In-Reply-To: <109c05ead54c3e48a8df27794c8df56149343a37.1712437365.git.janneke@HIDDEN>
(Janneke Nieuwenhuizen's message of "Sat, 6 Apr 2024 23:18:01 +0200")
References: <cover.1712437365.git.janneke@HIDDEN>
<109c05ead54c3e48a8df27794c8df56149343a37.1712437365.git.janneke@HIDDEN>
Date: Mon, 08 Apr 2024 11:41:11 +0200
Message-ID: <871q7gry2w.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 70169
Cc: 70169 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
Janneke Nieuwenhuizen <janneke@HIDDEN> skribis:
> * doc/local.mk (.dot.eps, png.eps): Remove %%CreationDate. Split single =
shell
> command into separate recipe lines, prefixed by $(AM_V_at).
>
> Change-Id: I5a03485c19c72f0c46411815c51290e52a8e5399
> ---
> doc/local.mk | 12 ++++++++----
> 1 file changed, 8 insertions(+), 4 deletions(-)
>
> diff --git a/doc/local.mk b/doc/local.mk
> index c355bec8d7..60e36091ce 100644
> --- a/doc/local.mk
> +++ b/doc/local.mk
> @@ -152,12 +152,16 @@ DOT_OPTIONS =3D \
> mv "$(srcdir)/$@.tmp" "$(srcdir)/$@"
>=20=20
> .dot.eps:
> - $(AM_V_DOT)$(DOT) -Teps $(DOT_OPTIONS) < "$<" > "$(srcdir)/$@.tmp"; \
> - mv "$(srcdir)/$@.tmp" "$(srcdir)/$@"
> + $(AM_V_DOT)$(DOT) -Teps $(DOT_OPTIONS) < "$<" > "$(srcdir)/$@.tmp"
> + $(AM_V_at)grep -v ^%%CreationDate: "$(srcdir)/$@.tmp" > "$(srcdir)/$@.t=
mp2"
> + $(AM_V_at)rm -f "$(srcdir)/$@.tmp"
> + $(AM_V_at)mv "$(srcdir)/$@.tmp2" "$@"
Apparently =E2=80=98dot=E2=80=99 (GraphViz) does not emit a =E2=80=98Creati=
onDate=E2=80=99 header.
Should we drop this change and add a line like this above the =E2=80=98mv=
=E2=80=99 line:
@if grep -q CreationDate "$@.tmp"; then false; else true; fi
to be on the safe side?
> .png.eps:
> - $(AM_V_GEN)convert "$<" "$@-tmp.eps"; \
> - mv "$@-tmp.eps" "$@"
> + $(AM_V_GEN)convert "$<" "$@-tmp.eps"
> + $(AM_V_at)grep -v ^%%CreationDate: "$@-tmp.eps" > "$@-tmp2.eps"
> + $(AM_V_at)rm -f "$@-tmp.eps"
> + $(AM_V_at)mv "$@-tmp2.eps" "$@"
Looking into the code of ImageMagick, I see:
--8<---------------cut here---------------start------------->8---
timer=3DGetMagickTime();
(void) FormatMagickTime(timer,MaxTextExtent,date);
(void) FormatLocaleString(buffer,MaxTextExtent,
"%%%%CreationDate: %s\n",date);
--8<---------------cut here---------------end--------------->8---
where =E2=80=98GetMagickTime=E2=80=99 honors =E2=80=98SOURCE_DATE_EPOCH=E2=
=80=99. Should we set
=E2=80=98SOURCE_DATE_EPOCH=E2=80=99 and avoid the =E2=80=98grep=E2=80=99 tr=
ick?
OTOH, an argument to keep this patch as-is is that it=E2=80=99ll resist to
changes in ImageMagick/GraphViz. So maybe the comments above aren=E2=80=99t
that relevant.
Ludo=E2=80=99.
guix-patches@HIDDEN:bug#70169; Package guix-patches.
Full text available.
Received: (at 70169) by debbugs.gnu.org; 8 Apr 2024 09:41:18 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Mon Apr 08 05:41:18 2024
Received: from localhost ([127.0.0.1]:45298 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rtlV8-0003HT-71
for submit <at> debbugs.gnu.org; Mon, 08 Apr 2024 05:41:18 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:35732)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <janneke@HIDDEN>) id 1rtlV6-0003H3-FF
for 70169 <at> debbugs.gnu.org; Mon, 08 Apr 2024 05:41:17 -0400
Received: from fencepost.gnu.org ([2001:470:142:3::e])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <janneke@HIDDEN>)
id 1rtlUr-0004bO-5a; Mon, 08 Apr 2024 05:41:01 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To:
From; bh=PMkYHfsHzVPQSc7B5BMXJtouB5nHYZxxq6Mzu8Kr3EI=; b=o5ZDmPOrn+E69dfp2qPs
hRUwHgCZRPwRCxswV5pxMhuCKTtQXpbPTFzRba+j6iJ69ZpgTZ3MV1n88dnzU7FNOT1mMCTmV94eR
SiVamRwQt96RNg9TG1DWjDm+ZKc6wrTJuEUNsB7Pdx2iXuhDggYOeJsPvPqpRDveO2YWOMbgHYhsO
NfF2FHF8gKpdKvGFgrIvAFigKYQvdJenFp66ubdMallGLDeyV3TCq/zS7nWr53nZRa/OCHKyulMhk
KtAZOsec0PVqxbJ79NURI/0X4Kf/gIB2adFVgeZgAFUkN8/xoyiw0axq0v1S2wu/56HpPy7VASwtJ
acYJLoBD/0+lIg==;
From: Janneke Nieuwenhuizen <janneke@HIDDEN>
To: Ludovic =?utf-8?Q?Court=C3=A8s?= <ludo@HIDDEN>
Subject: Re: [bug#70169] [PATCH v2 04/12] maint: Help help2man generate
reproducible man-pages.
In-Reply-To: <87edbgrywv.fsf@HIDDEN> ("Ludovic =?utf-8?Q?Court=C3=A8s=22'?=
=?utf-8?Q?s?= message of "Mon, 08 Apr 2024 11:23:12 +0200")
Organization: AvatarAcademy.nl
References: <cover.1712437365.git.janneke@HIDDEN>
<34915f43ed2e8b7ae99c3fe2fd65e7b97ff8f57b.1712437365.git.janneke@HIDDEN>
<87sezxmg6y.fsf@HIDDEN> <87edbgrywv.fsf@HIDDEN>
X-Url: http://AvatarAcademy.nl
Date: Mon, 08 Apr 2024 11:40:56 +0200
Message-ID: <87bk6kdwev.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 70169
Cc: 70169 <at> debbugs.gnu.org,
"pelzflorian \(Florian Pelz\)" <pelzflorian@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
Ludovic Court=C3=A8s writes:
Hi,
> "pelzflorian (Florian Pelz)" <pelzflorian@HIDDEN> skribis:
>
>> Looking at the now gone instructions from =E2=80=9Cgit show
>> 83c60bb0622440afe98930820186ddfa1e6e8b2f=E2=80=9D, at that time, a times=
tamp of
>> 1 was used for the tarball; I do not remember why. In
>> guix/scripts/pack.scm, 1 is used for squashfs and docker images.
>
> In the store, a timestamp of 1 (not 0) is used. This is because there
> are tools (among which =E2=80=98make=E2=80=99 IIRC) that behave different=
ly when mtime
> is zero.
>
> For consistency and to be on the safe side, it=E2=80=99s probably a good =
idea to
> do the same (as the fallback in this case).
Okay, will change for v3.
guix-patches@HIDDEN:bug#70169; Package guix-patches.
Full text available.Received: (at 70169) by debbugs.gnu.org; 8 Apr 2024 09:26:33 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Mon Apr 08 05:26:33 2024 Received: from localhost ([127.0.0.1]:45282 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rtlGq-00028d-US for submit <at> debbugs.gnu.org; Mon, 08 Apr 2024 05:26:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54512) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <ludo@HIDDEN>) id 1rtlGp-00028B-Ox for 70169 <at> debbugs.gnu.org; Mon, 08 Apr 2024 05:26:32 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <ludo@HIDDEN>) id 1rtlGd-0002Pk-5B; Mon, 08 Apr 2024 05:26:19 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=oPrNCNnnqgzVvrcYSEI9RhP4Me6yLsxDv9m3pXkWKaU=; b=nqOgFKbftJKXeRmsYJQw ey3z9YgOyiwohmeHClmrDlPxOp4o2amlFkwTDwiiiw1WDpR0hsWzrm1gEhzVzuhzcZtYbN0P1ueWf 2Qd98aB+t5rM0hjaLwg370sx0Bh4z9Iouom1uClC7Rxo9vAFnP2LkadFZiTrf43vDhfyOVBmuKCbH f73ozO2REUv1RBU6mK5tJXv4qCIXDJBCPvmEPT8pP10KWznRIfKD4VWwPzXpDjD2WXQEhX6uyvhfU 8wemfly8QmTOsU1AHA3CgiSgOXg0taviJ1RwB0JZfMg87CqamY+omDd2IcXOzJJazT1E/hSt2yMJ3 NTs61w3fRegCcA==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= <ludo@HIDDEN> To: Janneke Nieuwenhuizen <janneke@HIDDEN> Subject: Re: [bug#70169] [PATCH 5/7] maint: Generate 'doc/version-LANG.texi' reproducibly. In-Reply-To: <87frw2p4oz.fsf@HIDDEN> (Janneke Nieuwenhuizen's message of "Wed, 03 Apr 2024 22:33:00 +0200") References: <cover.1712165977.git.janneke@HIDDEN> <947bed93d2e2fec221fdec0d247f61912fb89567.1712165977.git.janneke@HIDDEN> <87o7aqxkgw.fsf@HIDDEN> <87frw2p4oz.fsf@HIDDEN> Date: Mon, 08 Apr 2024 11:26:16 +0200 Message-ID: <877ch8ryrr.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 70169 Cc: 70169 <at> debbugs.gnu.org X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -3.3 (---) Janneke Nieuwenhuizen <janneke@HIDDEN> skribis: > Ludovic Court=C3=A8s writes: > >> Janneke Nieuwenhuizen <janneke@HIDDEN> skribis: >> >>> +$(eval $(call version.texi-from-git,vti,doc/guix.texi,)) >>> +$(foreach lang, $(MANUAL_LANGUAGES), \ >>> + $(eval i=3D$(shell echo $$(($(i)+1)))) \ >>> + $(eval $(call version.texi-from-git,$(i),po/doc/guix-manual.$(lang).p= o,-$(lang)))) >> >> Maybe we could drop =E2=80=98i=E2=80=99 and instead create =E2=80=98samp= -fr=E2=80=99, =E2=80=98stamp-de=E2=80=99, and so >> on? That is, =E2=80=98version.texi-from-git=E2=80=99 would take 2 argum= ents instead of 3. > > I don't think so, or, I wouldn't know how to do that. The stamp-N is > created by Automake's magic. They are distributed together with the > version-LANG.texi files. > > If Automake would have used stamp-LANG, this would have been much > easier, we could probably have used stem (%) instead of this hairy > function. Oh, I see. I didn't know there were internal uses of =E2=80=98stamp-N=E2= =80=99. Ludo=E2=80=99.
guix-patches@HIDDEN:bug#70169; Package guix-patches.
Full text available.Received: (at 70169) by debbugs.gnu.org; 8 Apr 2024 09:23:33 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Mon Apr 08 05:23:32 2024 Received: from localhost ([127.0.0.1]:45277 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rtlDw-0001tt-8r for submit <at> debbugs.gnu.org; Mon, 08 Apr 2024 05:23:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55194) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <ludo@HIDDEN>) id 1rtlDu-0001tf-Ie for 70169 <at> debbugs.gnu.org; Mon, 08 Apr 2024 05:23:31 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <ludo@HIDDEN>) id 1rtlDg-0001yh-E5; Mon, 08 Apr 2024 05:23:16 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=J5iovav2nb5v3Vd7W+Lrh362OC0oASl8lUy84vW5HTY=; b=IUEj03mMX83TzB0BAOkQ ojkVB9COUBerIfeFF/ApOD9kNq+vzL7Lqup9wfRGnTF0IzS3NNOU2DeGaQ59/eCbowDm60Xgp6fBw IWrGsDCzI5YZliX3w7rbtnha5gH2lU8c1W5uWgKVfqC4cvM7IEmguD/R7Xu02KjJYWVtE+ZU2XMTl BjuZgvuQcCu5Dx6aKX3Z7syTCD1nm1odaLaNihK5Be6fRNQJr23BZoNLkCu5oO07Ti/MmgvI6YXmT PaG1nM77QTiu4eiaSZDURtv2hTSa8VrkNXBqnM1MQMgn/MXqoVTX5JSgurXwdBzt9zuRn9YdD1V6S c3I4uU04QCJAyA==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= <ludo@HIDDEN> To: "pelzflorian (Florian Pelz)" <pelzflorian@HIDDEN> Subject: Re: [bug#70169] [PATCH v2 04/12] maint: Help help2man generate reproducible man-pages. In-Reply-To: <87sezxmg6y.fsf@HIDDEN> (pelzflorian@HIDDEN's message of "Sun, 07 Apr 2024 15:54:13 +0200") References: <cover.1712437365.git.janneke@HIDDEN> <34915f43ed2e8b7ae99c3fe2fd65e7b97ff8f57b.1712437365.git.janneke@HIDDEN> <87sezxmg6y.fsf@HIDDEN> Date: Mon, 08 Apr 2024 11:23:12 +0200 Message-ID: <87edbgrywv.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 70169 Cc: 70169 <at> debbugs.gnu.org, Janneke Nieuwenhuizen <janneke@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -3.3 (---) Hello, "pelzflorian (Florian Pelz)" <pelzflorian@HIDDEN> skribis: > Looking at the now gone instructions from =E2=80=9Cgit show > 83c60bb0622440afe98930820186ddfa1e6e8b2f=E2=80=9D, at that time, a timest= amp of > 1 was used for the tarball; I do not remember why. In > guix/scripts/pack.scm, 1 is used for squashfs and docker images. In the store, a timestamp of 1 (not 0) is used. This is because there are tools (among which =E2=80=98make=E2=80=99 IIRC) that behave differently= when mtime is zero. For consistency and to be on the safe side, it=E2=80=99s probably a good id= ea to do the same (as the fallback in this case). Ludo=E2=80=99.
guix-patches@HIDDEN:bug#70169; Package guix-patches.
Full text available.Received: (at 70169) by debbugs.gnu.org; 7 Apr 2024 18:09:51 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sun Apr 07 14:09:51 2024 Received: from localhost ([127.0.0.1]:44524 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rtWxi-0004tQ-SK for submit <at> debbugs.gnu.org; Sun, 07 Apr 2024 14:09:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55484) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <janneke@HIDDEN>) id 1rtWxg-0004t4-Bg for 70169 <at> debbugs.gnu.org; Sun, 07 Apr 2024 14:09:49 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <janneke@HIDDEN>) id 1rtWxS-0005Gf-KJ; Sun, 07 Apr 2024 14:09:34 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=uZfYICmTFUOwrCGdAE2oe4tLGBvlimJRmZMfhUk4dbM=; b=ffbVFIs3wHHuIRt/jCLu XhjR0idF0rMjhRCV6d0Yy3Vrovb0UQjzghHg69K8+eub4mXXWe/wRAbkGbre7QmQNF/wpo0LigBJD mOLGLqKHCElPIe/lf6wV0q/5iXc9o/duqlnXKofWZusmygDK7g4oMa3gsUFmVhpoMT7aj1IQP41Ze uPjY6W9IrPgadhsYbhq8hx22xOjH93cweWErnYHRqsOxNsvwbKlBsZYTNj04g8ZN0eZ9L29xcrcg3 aAQj9yT1ndm1S7QSIamVKfU611Hg3s/RAixHKoPoVMYksL3E8ysjygYs0XhGeLh60bVFAXa5ICcSS sDlR2KVU9AWBjw==; From: Janneke Nieuwenhuizen <janneke@HIDDEN> To: "pelzflorian (Florian Pelz)" <pelzflorian@HIDDEN> Subject: Re: [bug#70169] [PATCH v2 11/12] maint: Reset CreationDate metadata on generated PDFs. In-Reply-To: <87sezxdqdt.fsf@HIDDEN> (Janneke Nieuwenhuizen's message of "Sun, 07 Apr 2024 19:38:54 +0200") Organization: AvatarAcademy.nl References: <cover.1712437365.git.janneke@HIDDEN> <7d3e7ef4c6ecfa77a6b6c237165c148578443511.1712437365.git.janneke@HIDDEN> <87cyr1f5zo.fsf@HIDDEN> <87sezxdqdt.fsf@HIDDEN> X-Url: http://AvatarAcademy.nl Date: Sun, 07 Apr 2024 20:09:29 +0200 Message-ID: <87msq5doyu.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 70169 Cc: 70169 <at> debbugs.gnu.org X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -3.3 (---) Janneke Nieuwenhuizen writes: Hi again, > pelzflorian (Florian Pelz) writes: > >> Janneke Nieuwenhuizen <janneke@HIDDEN> writes: [..] >> Perhaps AM_V_DOT cannot be used after export TZ=UTC0;? > > Ah, that's not good. Apparently I ontly tested using V=2 in the end. > > I believe this should fix it Come to think of it, as we're removeing CreationDate anyway, setting TZ is quite unnecessary, and we can just do .dot.pdf: $(AM_V_DOT)$(DOT) -Tpdf $(DOT_OPTIONS) < "$<" > "$(srcdir)/$@.tmp" [..] Thanks for looking into this!
guix-patches@HIDDEN:bug#70169; Package guix-patches.
Full text available.Received: (at 70169) by debbugs.gnu.org; 7 Apr 2024 17:39:16 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sun Apr 07 13:39:16 2024 Received: from localhost ([127.0.0.1]:44442 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rtWU7-00029T-Qj for submit <at> debbugs.gnu.org; Sun, 07 Apr 2024 13:39:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58214) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <janneke@HIDDEN>) id 1rtWU5-00028M-Fm for 70169 <at> debbugs.gnu.org; Sun, 07 Apr 2024 13:39:14 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <janneke@HIDDEN>) id 1rtWTq-0007Fh-ON; Sun, 07 Apr 2024 13:38:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=F+R4NzHPfJ9ZC2ivI1FyKcwNbGmzpfU8e+MjEc/69gs=; b=jZtUqqTWQ/Jso3BUcYc0 cNgilxmF8cbDEoGGkQCta6jzgoC4CvENN+9MGAfiQ6VLSEcgY7RyVS/EiO4CoVRpuKHoYUI3BMOqc 7e5pAT1MUNDFCVlTl9ZRNh+9qJaoZo2sYDZdE3jUwLxRo33OeX1Xi4D4eht5jm0kqTyaPHjDr0uP0 T4cz0lNuvh0yPnFtjd8GUuFEQXcgYZFI7nIWSwcSImCkkamWXjpJaPWufSV9bbLkUbC1D+R3pnfFa hxmr67HLJj1l/SGSlYfZ2C5nkZZwTxOb1ZLSreFXEw4/F6vmBNGOidT1xbzJL/9NEpIxKDcvhEuuA 8QFgtXFihqsq9g==; From: Janneke Nieuwenhuizen <janneke@HIDDEN> To: "pelzflorian (Florian Pelz)" <pelzflorian@HIDDEN> Subject: Re: [bug#70169] [PATCH v2 11/12] maint: Reset CreationDate metadata on generated PDFs. In-Reply-To: <87cyr1f5zo.fsf@HIDDEN> (pelzflorian@HIDDEN's message of "Sun, 07 Apr 2024 19:16:27 +0200") Organization: AvatarAcademy.nl References: <cover.1712437365.git.janneke@HIDDEN> <7d3e7ef4c6ecfa77a6b6c237165c148578443511.1712437365.git.janneke@HIDDEN> <87cyr1f5zo.fsf@HIDDEN> X-Url: http://AvatarAcademy.nl Date: Sun, 07 Apr 2024 19:38:54 +0200 Message-ID: <87sezxdqdt.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 70169 Cc: 70169 <at> debbugs.gnu.org X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -3.3 (---) pelzflorian (Florian Pelz) writes: Hi! > Janneke Nieuwenhuizen <janneke@HIDDEN> writes: >> diff --git a/doc/local.mk b/doc/local.mk >> index a0d94614d3..25741a5c88 100644 >> --- a/doc/local.mk >> +++ b/doc/local.mk >> @@ -148,7 +148,11 @@ DOT_OPTIONS =3D \ >> $(AM_V_at)mv "$(srcdir)/$@.tmp" "$(srcdir)/$@" >>=20=20 >> .dot.pdf: >> - $(AM_V_DOT)$(DOT) -Tpdf $(DOT_OPTIONS) < "$<" > "$(srcdir)/$@.tmp" >> + export TZ=3DUTC0; \ >> + $(AM_V_DOT)$(DOT) -Tpdf $(DOT_OPTIONS) < "$<" > "$(srcdir)/$@.tmp" > > I see a non-fatal message here that > > @echo " DOT " doc/images/bootstrap-graph.pdf;/bin/sh > '/home/florian/src/guix/test70169/build-aux/missing' dot -Tpdf > -Gratio=3D.9 -Gnodesep=3D.005 -Granksep=3D.00005 -Nfontsize=3D9 -Nheight= =3D.1 > -Nwidth=3D.1 < "doc/images/bootstrap-graph.dot" > > "./doc/images/bootstrap-graph.pdf.tmp" > /bin/sh: line 2: @echo: command not found > > Perhaps AM_V_DOT cannot be used after export TZ=3DUTC0;? Ah, that's not good. Apparently I ontly tested using V=3D2 in the end. I believe this should fix it diff --git a/doc/local.mk b/doc/local.mk index fffba409dc..0cdad3e58c 100644 --- a/doc/local.mk +++ b/doc/local.mk @@ -148,8 +148,8 @@ DOT_OPTIONS =3D \ $(AM_V_at)mv "$(srcdir)/$@.tmp" "$(srcdir)/$@" =20 .dot.pdf: - export TZ=3DUTC0; \ - $(AM_V_DOT)$(DOT) -Tpdf $(DOT_OPTIONS) < "$<" > "$(srcdir)/$@.tmp" + $(AM_V_DOT)export TZ=3DUTC0; \ + $(DOT) -Tpdf $(DOT_OPTIONS) < "$<" > "$(srcdir)/$@.tmp" $(AM_V_at)sed -ri \ -e 's,(/CreationDate \(D:).*\),\119700101000000,' \ "$(srcdir)/$@.tmp" Greetings, Janneke --=20 Janneke Nieuwenhuizen <janneke@HIDDEN> | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar=C2=AE https://AvatarAcade= my.com
guix-patches@HIDDEN:bug#70169; Package guix-patches.
Full text available.
Received: (at 70169) by debbugs.gnu.org; 7 Apr 2024 17:16:45 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Apr 07 13:16:45 2024
Received: from localhost ([127.0.0.1]:44397 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rtW8L-0000Ax-FU
for submit <at> debbugs.gnu.org; Sun, 07 Apr 2024 13:16:45 -0400
Received: from relay.yourmailgateway.de ([188.68.63.162]:52779)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pelzflorian@HIDDEN>) id 1rtW8I-0000Ao-VW
for 70169 <at> debbugs.gnu.org; Sun, 07 Apr 2024 13:16:44 -0400
Received: from mors-relay-8201.netcup.net (localhost [127.0.0.1])
by mors-relay-8201.netcup.net (Postfix) with ESMTPS id 4VCJmL3vkcz3wRd;
Sun, 7 Apr 2024 19:16:34 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=pelzflorian.de;
s=key2; t=1712510194;
bh=1PclcaB74s/ziK7FUtEp+Lu9Vj7oJsx4FqHL3kYifxc=;
h=From:To:Cc:Subject:In-Reply-To:References:Date:From;
b=jpzVknhUn0JhX/1pxxlnR8po5gHS0sNfs2UwHRd/7jI2IiHHqVdVS7mFHqutV0WK9
43YZfggJyJA0Uw/mTySDNOk3j6Hx7egeTvewz9z+d0dE6ennHz2ZncMvzjXVMCJlkH
iBd7REfY9XNorjISvZy/xXMf4zBhmdPPt1be38D1NtcUKn1TmmWCf6GgPF+G/b0qDV
N0TjRjzHAvpbPpDqHjc0h2y8f4CO5Lt5KX7+v1N/FZztgEK9rpA1ageqEM/nIe2UD3
iN/0tV9wj6D3vBQqemNKEKNdfHnpDez69YPZ7asa7/uFR0h1G+1H3e1q+YpBncE0h1
v1Okif4AgGf2w==
Received: from policy02-mors.netcup.net (unknown [46.38.225.35])
by mors-relay-8201.netcup.net (Postfix) with ESMTPS id 4VCJmL3CS9z3wQv;
Sun, 7 Apr 2024 19:16:34 +0200 (CEST)
Received: from mxe217.netcup.net (unknown [10.243.12.53])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by policy02-mors.netcup.net (Postfix) with ESMTPS id 4VCJmL0nBzz8sb8;
Sun, 7 Apr 2024 19:16:33 +0200 (CEST)
Received: from florianrock64 (ip92344de0.dynamic.kabel-deutschland.de
[146.52.77.224])
by mxe217.netcup.net (Postfix) with ESMTPSA id BF5CF827E2;
Sun, 7 Apr 2024 19:16:28 +0200 (CEST)
From: "pelzflorian (Florian Pelz)" <pelzflorian@HIDDEN>
To: Janneke Nieuwenhuizen <janneke@HIDDEN>
Subject: Re: [bug#70169] [PATCH v2 11/12] maint: Reset CreationDate metadata
on generated PDFs.
In-Reply-To: <7d3e7ef4c6ecfa77a6b6c237165c148578443511.1712437365.git.janneke@HIDDEN>
(Janneke Nieuwenhuizen's message of "Sat, 6 Apr 2024 23:18:03 +0200")
References: <cover.1712437365.git.janneke@HIDDEN>
<7d3e7ef4c6ecfa77a6b6c237165c148578443511.1712437365.git.janneke@HIDDEN>
Date: Sun, 07 Apr 2024 19:16:27 +0200
Message-ID: <87cyr1f5zo.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain
X-Rspamd-Queue-Id: BF5CF827E2
X-Rspamd-Server: rspamd-worker-8404
X-NC-CID: 74gH6MwgrAFKUDtO+owPkA/HPxU2bkYnUOa6x+M1wv15WD9UxV2xl/uZ
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 70169
Cc: 70169 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
Janneke Nieuwenhuizen <janneke@HIDDEN> writes:
> diff --git a/doc/local.mk b/doc/local.mk
> index a0d94614d3..25741a5c88 100644
> --- a/doc/local.mk
> +++ b/doc/local.mk
> @@ -148,7 +148,11 @@ DOT_OPTIONS = \
> $(AM_V_at)mv "$(srcdir)/$@.tmp" "$(srcdir)/$@"
>
> .dot.pdf:
> - $(AM_V_DOT)$(DOT) -Tpdf $(DOT_OPTIONS) < "$<" > "$(srcdir)/$@.tmp"
> + export TZ=UTC0; \
> + $(AM_V_DOT)$(DOT) -Tpdf $(DOT_OPTIONS) < "$<" > "$(srcdir)/$@.tmp"
I see a non-fatal message here that
@echo " DOT " doc/images/bootstrap-graph.pdf;/bin/sh '/home/florian/src/guix/test70169/build-aux/missing' dot -Tpdf -Gratio=.9 -Gnodesep=.005 -Granksep=.00005 -Nfontsize=9 -Nheight=.1 -Nwidth=.1 < "doc/images/bootstrap-graph.dot" > "./doc/images/bootstrap-graph.pdf.tmp"
/bin/sh: line 2: @echo: command not found
Perhaps AM_V_DOT cannot be used after export TZ=UTC0;?
> + $(AM_V_at)sed -ri \
> + -e 's,(/CreationDate [(]D:)[0-9+]{14},\119700101000000,' \
> + "$(srcdir)/$@.tmp"
> $(AM_V_at)mv "$(srcdir)/$@.tmp" "$(srcdir)/$@"
>
> .dot.eps:
Regards,
Florian
guix-patches@HIDDEN:bug#70169; Package guix-patches.
Full text available.Received: (at 70169) by debbugs.gnu.org; 7 Apr 2024 15:20:47 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sun Apr 07 11:20:47 2024 Received: from localhost ([127.0.0.1]:44333 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rtUK6-0003pf-Vz for submit <at> debbugs.gnu.org; Sun, 07 Apr 2024 11:20:47 -0400 Received: from relay.yourmailgateway.de ([46.38.247.119]:50213) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <pelzflorian@HIDDEN>) id 1rtUK3-0003pW-R0 for 70169 <at> debbugs.gnu.org; Sun, 07 Apr 2024 11:20:45 -0400 Received: from mors-relay-8404.netcup.net (localhost [127.0.0.1]) by mors-relay-8404.netcup.net (Postfix) with ESMTPS id 4VCGBW3cbFz80Py; Sun, 7 Apr 2024 17:20:35 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=pelzflorian.de; s=key2; t=1712503235; bh=jVtapH4J1xlC9v/IS0tsjTdhyz1tSPgOevJebKu0Q5U=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=EL5/recWcbAYL9UtsjiZRE9iW56P6zNsDZPt4N4R1aQTXZgDle2KblZ1t3rtjTrmA xoWBxvXLUyLFR5bZllLBDZ1kyTR4FcxHHDTLDQ81/0sqWbmwZUhKGbKH7UqE/6/iCc QvVNfw2t/6WRjryLUTwOWZmy1M7JZwzptWRrqKEGQKtEJU/poyDwBDWWoiiED2u9+W E6gaTyY6sVIq5gvxlIFgjxS2yVkF9VpZ+oZw8XlW+ILQOxJSUf1MkVyX4cLPADjrf7 3u/tYYt5SQh7EwmfCzjRwz/bcI2Dk89Vm31XMsMgm4rtvjyF3mWzypZ/cx/z2RxzFu NO2ehNQmJAZoQ== Received: from policy02-mors.netcup.net (unknown [46.38.225.35]) by mors-relay-8404.netcup.net (Postfix) with ESMTPS id 4VCGBW3DxBz4ynZ; Sun, 7 Apr 2024 17:20:35 +0200 (CEST) Received: from mxe217.netcup.net (unknown [10.243.12.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by policy02-mors.netcup.net (Postfix) with ESMTPS id 4VCGBW1g7Tz8sbD; Sun, 7 Apr 2024 17:20:35 +0200 (CEST) Received: from florianrock64 (ip92344de0.dynamic.kabel-deutschland.de [146.52.77.224]) by mxe217.netcup.net (Postfix) with ESMTPSA id E424882443; Sun, 7 Apr 2024 17:20:29 +0200 (CEST) From: "pelzflorian (Florian Pelz)" <pelzflorian@HIDDEN> To: Janneke Nieuwenhuizen <janneke@HIDDEN> Subject: Re: [bug#70169] [PATCH v2 04/12] maint: Help help2man generate reproducible man-pages. In-Reply-To: <87bk6li7wy.fsf@HIDDEN> (Janneke Nieuwenhuizen's message of "Sun, 07 Apr 2024 16:06:37 +0200") References: <cover.1712437365.git.janneke@HIDDEN> <34915f43ed2e8b7ae99c3fe2fd65e7b97ff8f57b.1712437365.git.janneke@HIDDEN> <87sezxmg6y.fsf@HIDDEN> <87bk6li7wy.fsf@HIDDEN> Date: Sun, 07 Apr 2024 17:20:29 +0200 Message-ID: <87h6gdci82.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Rspamd-Queue-Id: E424882443 X-Rspamd-Server: rspamd-worker-8404 X-NC-CID: P58ml4kwlJkLMZXGbWAGwuUJdxASi9xVZitGCjivErZrEe5UHsG4kurF X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 70169 Cc: 70169 <at> debbugs.gnu.org X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) Janneke Nieuwenhuizen <janneke@HIDDEN> writes: > pelzflorian (Florian Pelz) writes: >> Is 1 a better timestamp than 0? > > For files, using 1 is preferrable if it's not a source file. We use 1 > for .go files, and 0 for .scm files, iirc. SOURCE_DATE_EPOCH is (only) > used for the date in the document. Without git, 0 is as good a guess > for a reproducible date for use in a document as any, I think. > > Greetings, > Janneke Thank you for explaining. So this SOURCE_DATE_EPOCH applies to all the generated files in doc/ but still 0 is fine, because noone warns if they are not later than source files, IIUC. Regards, Florian
guix-patches@HIDDEN:bug#70169; Package guix-patches.
Full text available.Received: (at 70169) by debbugs.gnu.org; 7 Apr 2024 14:06:58 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sun Apr 07 10:06:58 2024 Received: from localhost ([127.0.0.1]:44256 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rtTAg-0005qq-7s for submit <at> debbugs.gnu.org; Sun, 07 Apr 2024 10:06:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44158) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <janneke@HIDDEN>) id 1rtTAc-0005pp-7Z for 70169 <at> debbugs.gnu.org; Sun, 07 Apr 2024 10:06:56 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <janneke@HIDDEN>) id 1rtTAP-0007Uj-J9; Sun, 07 Apr 2024 10:06:41 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=N0Xj7QO/sm/zz/Iyg/lXf5cl7hxxsVyzTXN7VSRVm7c=; b=iufknZHMxPAoqs2FipiF SBuUdJAIGatYV2wbfxge3DcBpcBMe74kecPCOPWzAXSi2LADupA4+W5bKkPIWBbocy4faPU+f03LX qh4KFi10xp9U+2vpuRjtVw6H7PxFDhmCHEfkwaEaZxLwtWuwsblnvSiBdQPxmokkLVeBuFE+MerfM xfG8+zkXzK8aVn5yBJLcja51YibTAcGISS838f69gx1v4HQDdfzHSKWpY6DUmnra+IJu4o9Wplqsj n2tzQg41kjrpUfEKS1GniUKWNGyOupup3TrV/oP9ahY5A0R2hh6EjdLJBLSoVkDpKA5zERCQeeoSC NuiAlHAWSEpH0w==; From: Janneke Nieuwenhuizen <janneke@HIDDEN> To: "pelzflorian (Florian Pelz)" <pelzflorian@HIDDEN> Subject: Re: [bug#70169] [PATCH v2 04/12] maint: Help help2man generate reproducible man-pages. In-Reply-To: <87sezxmg6y.fsf@HIDDEN> (pelzflorian@HIDDEN's message of "Sun, 07 Apr 2024 15:54:13 +0200") Organization: AvatarAcademy.nl References: <cover.1712437365.git.janneke@HIDDEN> <34915f43ed2e8b7ae99c3fe2fd65e7b97ff8f57b.1712437365.git.janneke@HIDDEN> <87sezxmg6y.fsf@HIDDEN> X-Url: http://AvatarAcademy.nl Date: Sun, 07 Apr 2024 16:06:37 +0200 Message-ID: <87bk6li7wy.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 70169 Cc: 70169 <at> debbugs.gnu.org X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -3.3 (---) pelzflorian (Florian Pelz) writes: Hello Florian, > Janneke Nieuwenhuizen <janneke@HIDDEN> writes: >> diff --git a/doc/local.mk b/doc/local.mk >> +SOURCE_DATE_EPOCH =3D $(shell git show HEAD --format=3D%ct --no-patch 2= >/dev/null || echo 0) >> +export SOURCE_DATE_EPOCH > > Do I interpret correctly that =E2=80=9Cecho 0=E2=80=9D is a fallback time= stamp? Yes. > Looking at the now gone instructions from =E2=80=9Cgit show > 83c60bb0622440afe98930820186ddfa1e6e8b2f=E2=80=9D, at that time, a timest= amp of > 1 was used for the tarball; I do not remember why. In > guix/scripts/pack.scm, 1 is used for squashfs and docker images. That's probably because of build dependencies. > Is 1 a better timestamp than 0? For files, using 1 is preferrable if it's not a source file. We use 1 for .go files, and 0 for .scm files, iirc. SOURCE_DATE_EPOCH is (only) used for the date in the document. Without git, 0 is as good a guess for a reproducible date for use in a document as any, I think. Greetings, Janneke --=20 Janneke Nieuwenhuizen <janneke@HIDDEN> | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar=C2=AE https://AvatarAcade= my.com
guix-patches@HIDDEN:bug#70169; Package guix-patches.
Full text available.Received: (at 70169) by debbugs.gnu.org; 7 Apr 2024 13:54:32 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sun Apr 07 09:54:32 2024 Received: from localhost ([127.0.0.1]:41855 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rtSye-0004DR-EI for submit <at> debbugs.gnu.org; Sun, 07 Apr 2024 09:54:32 -0400 Received: from relay.yourmailgateway.de ([188.68.63.162]:39103) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <pelzflorian@HIDDEN>) id 1rtSyb-0004DH-Un for 70169 <at> debbugs.gnu.org; Sun, 07 Apr 2024 09:54:31 -0400 Received: from mors-relay-8201.netcup.net (localhost [127.0.0.1]) by mors-relay-8201.netcup.net (Postfix) with ESMTPS id 4VCDH12mcCz3wKJ; Sun, 7 Apr 2024 15:54:21 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=pelzflorian.de; s=key2; t=1712498061; bh=rFbPWy7gef/hRYU5QEvCEyNw1dUg2eB7QvHF7h+dVmg=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=Nq1Q0XQ4ZRdgUrFgi/55XSrm8mT8k1AGAAZ3BvtJ2BDcVjKtLdNxTzfGjS0Y7lcA1 HykKyo06Yfdjz9Mh8KAfdf5elZ+yogHuZsLNkQtiGfedSakAPrQXygia3JQSM8Lk2D cHYmKbAPlTHL0/0Gifbc2mRakhxkwnFx7GdcPgschWUZoctmFWxxqKJFdN/4w3TrKR amwWc/VKob8Y7wvRi/p8TLZhkMIuROaZYLnlsow0YmYEuciEMWXPHviY3AC1KN6rT4 7Aa/O9K9VXXobiuFR1vNNFlEvImDKz/bSesLQ6C3UrreqrXvJRNWQZplZ4wRtEJT4v ieOUvEfqBsNwA== Received: from policy02-mors.netcup.net (unknown [46.38.225.35]) by mors-relay-8201.netcup.net (Postfix) with ESMTPS id 4VCDH124FNz3wJw; Sun, 7 Apr 2024 15:54:21 +0200 (CEST) Received: from mxe217.netcup.net (unknown [10.243.12.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by policy02-mors.netcup.net (Postfix) with ESMTPS id 4VCDH10KZsz8sb7; Sun, 7 Apr 2024 15:54:20 +0200 (CEST) Received: from florianrock64 (ip92344de0.dynamic.kabel-deutschland.de [146.52.77.224]) by mxe217.netcup.net (Postfix) with ESMTPSA id 9CACA82D51; Sun, 7 Apr 2024 15:54:15 +0200 (CEST) From: "pelzflorian (Florian Pelz)" <pelzflorian@HIDDEN> To: Janneke Nieuwenhuizen <janneke@HIDDEN> Subject: Re: [bug#70169] [PATCH v2 04/12] maint: Help help2man generate reproducible man-pages. In-Reply-To: <34915f43ed2e8b7ae99c3fe2fd65e7b97ff8f57b.1712437365.git.janneke@HIDDEN> (Janneke Nieuwenhuizen's message of "Sat, 6 Apr 2024 23:17:56 +0200") References: <cover.1712437365.git.janneke@HIDDEN> <34915f43ed2e8b7ae99c3fe2fd65e7b97ff8f57b.1712437365.git.janneke@HIDDEN> Date: Sun, 07 Apr 2024 15:54:13 +0200 Message-ID: <87sezxmg6y.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 9CACA82D51 X-Rspamd-Server: rspamd-worker-8404 X-NC-CID: mSuk/gC8fry6/hYTiMgqDj10n5gsimByRz9p5I5cnJXG32SXQa4gMmHB X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 70169 Cc: 70169 <at> debbugs.gnu.org X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) Hello Jan, Janneke Nieuwenhuizen <janneke@HIDDEN> writes: > diff --git a/doc/local.mk b/doc/local.mk > index 5f014b9c3d..017686137a 100644 > --- a/doc/local.mk > +++ b/doc/local.mk > @@ -224,6 +224,9 @@ gen_man =3D \ > $(HELP2MANFLAGS) >=20=20 > HELP2MANFLAGS =3D --source=3DGNU --info-page=3D$(PACKAGE_TARNAME) > +# help2man reproducibility > +SOURCE_DATE_EPOCH =3D $(shell git show HEAD --format=3D%ct --no-patch 2>= /dev/null || echo 0) > +export SOURCE_DATE_EPOCH >=20=20 > $(srcdir)/%D%/guix.1: scripts/guix.in $(sub_commands_mans) > -$(AM_V_HELP2MAN)$(gen_man) --output=3D"$@" `basename "$@" .1` Do I interpret correctly that =E2=80=9Cecho 0=E2=80=9D is a fallback timest= amp? Looking at the now gone instructions from =E2=80=9Cgit show 83c60bb0622440afe98930820186ddfa1e6e8b2f=E2=80=9D, at that time, a timestam= p of 1 was used for the tarball; I do not remember why. In guix/scripts/pack.scm, 1 is used for squashfs and docker images. Is 1 a better timestamp than 0? Regards, Florian
guix-patches@HIDDEN:bug#70169; Package guix-patches.
Full text available.
Received: (at 70169) by debbugs.gnu.org; 7 Apr 2024 08:58:13 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Apr 07 04:58:13 2024
Received: from localhost ([127.0.0.1]:41600 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rtOLm-00082Y-KT
for submit <at> debbugs.gnu.org; Sun, 07 Apr 2024 04:58:13 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:37858)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <janneke@HIDDEN>) id 1rtOLh-00081x-SK
for 70169 <at> debbugs.gnu.org; Sun, 07 Apr 2024 04:58:05 -0400
Received: from fencepost.gnu.org ([2001:470:142:3::e])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <janneke@HIDDEN>)
id 1rtOLU-0007ka-GO; Sun, 07 Apr 2024 04:57:48 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To:
From; bh=UTirZJfCmBqTILdcKj14wQP4ICK/J3M4dRi17vY4eBM=; b=IMikJ6uZw9JeeUpcohsT
y3rf3Ziqww+4fV3DZ8MYZp5qXrN7WsZKDM+A7a6ZRoN+MLw7WnKa6kwV8w1lwOG5rXMirl/aj0/Kd
AUADdPCTe+xcFepMOyFNnnFAgN9lY3mPYrTHvHxHie0I7s/LgoM92/KCUIRsCJWje1yRp9tPbMDxl
tmCo3k2ZWugCzBogjmeJb4RPWxyMotar4aNyxSZFfKa1Rv9KNfv769l+MBwWo/SF1NB529Y5Rye21
qG5FGi8AZyzuZV2Uvumx/1RihQ0HhjhobhZ7IBqK6V2UJNINQrHSjkOaUCR2AETRViyqCA6KUt3jE
nq2v752EtHuf6g==;
From: Janneke Nieuwenhuizen <janneke@HIDDEN>
To: 70169 <at> debbugs.gnu.org
Subject: [PATCH v2 13/12] doc: Use "dejavu sans" instead of "Helvetica" or
"sans" in dot images.
In-Reply-To: <cover.1712437365.git.janneke@HIDDEN> (Janneke Nieuwenhuizen's
message of "Sat, 6 Apr 2024 23:17:52 +0200")
Organization: AvatarAcademy.nl
References: <cover.1712437365.git.janneke@HIDDEN>
X-Url: http://AvatarAcademy.nl
Date: Sun, 07 Apr 2024 10:57:43 +0200
Message-ID: <87msq5im7s.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="=-=-="
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 70169
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
--=-=-=
Content-Type: text/plain
Janneke Nieuwenhuizen writes:
> Note that you'll need an environment with something like
>
> guix shell -CP -m manifest.scm fontconfig font-ghostscript graphviz \
> imagemagick texlive-bin
Headsup: using the attached bonus patch the tarball reproduces for me
also without using a container, i.e., building it in
guix shell -CP -m manifest.scm fontconfig graphviz imagemagick texlive-bin
or
guix shell -m manifest.scm fontconfig graphviz imagemagick texlive-bin
now creates the same tarball for me.
Greetings,
Janneke
--=-=-=
Content-Type: text/x-patch
Content-Disposition: inline;
filename=v2-0013-doc-Use-dejavu-sans-instead-of-Helvetica-or-sans-.patch
From 83287968f06487fa907ef3575cef331b415350c7 Mon Sep 17 00:00:00 2001
Message-ID: <83287968f06487fa907ef3575cef331b415350c7.1712479964.git.janneke@HIDDEN>
In-Reply-To: <cover.1712479964.git.janneke@HIDDEN>
References: <cover.1712479964.git.janneke@HIDDEN>
From: Janneke Nieuwenhuizen <janneke@HIDDEN>
Date: Sun, 7 Apr 2024 10:03:06 +0200
Subject: [PATCH v2 13/12] doc: Use "dejavu sans" instead of "Helvetica" or
"sans" in dot images.
Font-dejavu is (now) an input of fontconfig. Specifying "dejavu sans" makes
generated images reproducible even when other fonts are installed (notably
font-google-noto).
* doc/images/bootstrap-graph.dot,
doc/images/bootstrap-packages.dot,
doc/images/coreutils-bag-graph.dot,
doc/images/coreutils-graph.dot,
doc/images/gcc-core-mesboot0-graph.dot,
doc/images/service-graph.dot,
doc/images/shepherd-graph.dot: Use fontname = "dejavu sans".
* doc/guix.texi (Full-Source Bootstrap): Update gcc-core-mesboot0.dot recipe
accordingly.
Change-Id: If21d7d39d45c66de5bceafb7b825a057d540ee50
---
doc/guix.texi | 7 +++-
doc/images/bootstrap-graph.dot | 52 ++++++++++++------------
doc/images/bootstrap-packages.dot | 32 +++++++--------
doc/images/coreutils-bag-graph.dot | 56 +++++++++++++-------------
doc/images/coreutils-graph.dot | 18 ++++-----
doc/images/gcc-core-mesboot0-graph.dot | 28 ++++++-------
doc/images/service-graph.dot | 16 ++++----
doc/images/shepherd-graph.dot | 54 ++++++++++++-------------
8 files changed, 134 insertions(+), 129 deletions(-)
diff --git a/doc/guix.texi b/doc/guix.texi
index 69a904473c..fdbbf58d66 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -48145,7 +48145,12 @@ Full-Source Bootstrap
@code{gcc-core-mesboot0}, the bootstrap compiler used for the
traditional bootstrap of the rest of the Guix System.
-@c ./pre-inst-env guix graph -e '(@@ (gnu packages commencement) gcc-core-mesboot0)' | sed -re 's,((bootstrap-seeds|guile-bootstrap).*shape =) box,\1 ellipse,' > doc/images/gcc-core-mesboot0-graph.dot
+@c ./pre-inst-env guix graph \
+@c -e '(@@ (gnu packages commencement) gcc-core-mesboot0)' \
+@c | sed -r \
+@c -e 's,((bootstrap-seeds|guile-bootstrap).*shape =) box,\1 ellipse,' \
+@c -e 's,fontname = sans,fontname = "dejavu sans",' \
+@c > doc/images/gcc-core-mesboot0-graph.dot
@image{images/gcc-core-mesboot0-graph,6in,,Dependency graph of gcc-core-mesboot0}
Work is ongoing to bring these bootstraps to the @code{arm-linux} and
diff --git a/doc/images/bootstrap-graph.dot b/doc/images/bootstrap-graph.dot
index 06d7f29c7a..317ee25749 100644
--- a/doc/images/bootstrap-graph.dot
+++ b/doc/images/bootstrap-graph.dot
@@ -1,7 +1,7 @@
# Obtained by running "nix-store --graph" on the first GCC derivation.
digraph G {
-"/nix/store/x60397za40lx0n88f51a2csfdq5xvb19-gcc-bootstrap-0.drv" [label = "gcc-bootstrap-0.drv", fontname = Helvetica, shape = box, style = filled, fillcolor = "#ffffff"];
+"/nix/store/x60397za40lx0n88f51a2csfdq5xvb19-gcc-bootstrap-0.drv" [label = "gcc-bootstrap-0.drv", fontname = "dejavu sans", shape = box, style = filled, fillcolor = "#ffffff"];
"/nix/store/3iawic1z95112yfz5y9xdp66qbxxr8l1-tar" -> "/nix/store/x60397za40lx0n88f51a2csfdq5xvb19-gcc-bootstrap-0.drv" [color = "black"];
"/nix/store/4sv9xhcjap6byca130fzpzzjalb7iixv-glibc-bootstrap-0.drv" -> "/nix/store/x60397za40lx0n88f51a2csfdq5xvb19-gcc-bootstrap-0.drv" [color = "red"];
"/nix/store/8cc81w6m04csm52y247xj3gydrbz2niv-xz" -> "/nix/store/x60397za40lx0n88f51a2csfdq5xvb19-gcc-bootstrap-0.drv" [color = "green"];
@@ -11,8 +11,8 @@ digraph G {
"/nix/store/r3dsy5j2c16sv26raala6kahff7w18hb-gcc-bootstrap-0-guile-builder" -> "/nix/store/x60397za40lx0n88f51a2csfdq5xvb19-gcc-bootstrap-0.drv" [color = "black"];
"/nix/store/x9x1a86flhx15cams7235rfy5gc5cww1-guile-bootstrap-2.0.drv" -> "/nix/store/x60397za40lx0n88f51a2csfdq5xvb19-gcc-bootstrap-0.drv" [color = "red"];
"/nix/store/y4n7rzysx6qz3p0n91dw9qz5w93l6iqv-module-import-compiled.drv" -> "/nix/store/x60397za40lx0n88f51a2csfdq5xvb19-gcc-bootstrap-0.drv" [color = "green"];
-"/nix/store/3iawic1z95112yfz5y9xdp66qbxxr8l1-tar" [label = "tar", fontname = Helvetica, shape = box, style = filled, fillcolor = "#ffffff"];
-"/nix/store/4sv9xhcjap6byca130fzpzzjalb7iixv-glibc-bootstrap-0.drv" [label = "glibc-bootstrap-0.drv", fontname = Helvetica, shape = box, style = filled, fillcolor = "#ffffff"];
+"/nix/store/3iawic1z95112yfz5y9xdp66qbxxr8l1-tar" [label = "tar", fontname = "dejavu sans", shape = box, style = filled, fillcolor = "#ffffff"];
+"/nix/store/4sv9xhcjap6byca130fzpzzjalb7iixv-glibc-bootstrap-0.drv" [label = "glibc-bootstrap-0.drv", fontname = "dejavu sans", shape = box, style = filled, fillcolor = "#ffffff"];
"/nix/store/3iawic1z95112yfz5y9xdp66qbxxr8l1-tar" -> "/nix/store/4sv9xhcjap6byca130fzpzzjalb7iixv-glibc-bootstrap-0.drv" [color = "blue"];
"/nix/store/8cc81w6m04csm52y247xj3gydrbz2niv-xz" -> "/nix/store/4sv9xhcjap6byca130fzpzzjalb7iixv-glibc-bootstrap-0.drv" [color = "magenta"];
"/nix/store/8iivk9hpnps21yrbq3zzsxgzv9ixbhgh-glibc-bootstrap-0-guile-builder" -> "/nix/store/4sv9xhcjap6byca130fzpzzjalb7iixv-glibc-bootstrap-0.drv" [color = "burlywood"];
@@ -20,63 +20,63 @@ digraph G {
"/nix/store/wdwrkg02gn28bkpbxgdb2nv558v8s3ji-glibc-2.17.tar.xz.drv" -> "/nix/store/4sv9xhcjap6byca130fzpzzjalb7iixv-glibc-bootstrap-0.drv" [color = "red"];
"/nix/store/x9x1a86flhx15cams7235rfy5gc5cww1-guile-bootstrap-2.0.drv" -> "/nix/store/4sv9xhcjap6byca130fzpzzjalb7iixv-glibc-bootstrap-0.drv" [color = "green"];
"/nix/store/y4n7rzysx6qz3p0n91dw9qz5w93l6iqv-module-import-compiled.drv" -> "/nix/store/4sv9xhcjap6byca130fzpzzjalb7iixv-glibc-bootstrap-0.drv" [color = "blue"];
-"/nix/store/8cc81w6m04csm52y247xj3gydrbz2niv-xz" [label = "xz", fontname = Helvetica, shape = box, style = filled, fillcolor = "#ffffff"];
-"/nix/store/8iivk9hpnps21yrbq3zzsxgzv9ixbhgh-glibc-bootstrap-0-guile-builder" [label = "glibc-bootstrap-0-guile-builder", fontname = Helvetica, shape = box, style = filled, fillcolor = "#ffffff"];
+"/nix/store/8cc81w6m04csm52y247xj3gydrbz2niv-xz" [label = "xz", fontname = "dejavu sans", shape = box, style = filled, fillcolor = "#ffffff"];
+"/nix/store/8iivk9hpnps21yrbq3zzsxgzv9ixbhgh-glibc-bootstrap-0-guile-builder" [label = "glibc-bootstrap-0-guile-builder", fontname = "dejavu sans", shape = box, style = filled, fillcolor = "#ffffff"];
"/nix/store/3iawic1z95112yfz5y9xdp66qbxxr8l1-tar" -> "/nix/store/8iivk9hpnps21yrbq3zzsxgzv9ixbhgh-glibc-bootstrap-0-guile-builder" [color = "magenta"];
"/nix/store/8cc81w6m04csm52y247xj3gydrbz2niv-xz" -> "/nix/store/8iivk9hpnps21yrbq3zzsxgzv9ixbhgh-glibc-bootstrap-0-guile-builder" [color = "burlywood"];
-"/nix/store/96yx6013dhggr3mpg5ayxv8dm9mv2ghv-module-import.drv" [label = "module-import.drv", fontname = Helvetica, shape = box, style = filled, fillcolor = "#ffffff"];
+"/nix/store/96yx6013dhggr3mpg5ayxv8dm9mv2ghv-module-import.drv" [label = "module-import.drv", fontname = "dejavu sans", shape = box, style = filled, fillcolor = "#ffffff"];
"/nix/store/9zrdfvnrpljryr82an2n1mj6bh2przhn-module-import-guile-builder" -> "/nix/store/96yx6013dhggr3mpg5ayxv8dm9mv2ghv-module-import.drv" [color = "black"];
"/nix/store/mj7amprgvl2rgash1nr0v64apik8vc7f-utils.scm" -> "/nix/store/96yx6013dhggr3mpg5ayxv8dm9mv2ghv-module-import.drv" [color = "red"];
"/nix/store/x9x1a86flhx15cams7235rfy5gc5cww1-guile-bootstrap-2.0.drv" -> "/nix/store/96yx6013dhggr3mpg5ayxv8dm9mv2ghv-module-import.drv" [color = "green"];
-"/nix/store/9zrdfvnrpljryr82an2n1mj6bh2przhn-module-import-guile-builder" [label = "module-import-guile-builder", fontname = Helvetica, shape = box, style = filled, fillcolor = "#ffffff"];
+"/nix/store/9zrdfvnrpljryr82an2n1mj6bh2przhn-module-import-guile-builder" [label = "module-import-guile-builder", fontname = "dejavu sans", shape = box, style = filled, fillcolor = "#ffffff"];
"/nix/store/mj7amprgvl2rgash1nr0v64apik8vc7f-utils.scm" -> "/nix/store/9zrdfvnrpljryr82an2n1mj6bh2przhn-module-import-guile-builder" [color = "blue"];
-"/nix/store/fl9cwcczfdv73vq5sr0c4rd5hqzrgvac-gcc-4.7.2.tar.xz.drv" [label = "gcc-4.7.2.tar.xz.drv", fontname = Helvetica, shape = box, style = filled, fillcolor = "#ffffff"];
+"/nix/store/fl9cwcczfdv73vq5sr0c4rd5hqzrgvac-gcc-4.7.2.tar.xz.drv" [label = "gcc-4.7.2.tar.xz.drv", fontname = "dejavu sans", shape = box, style = filled, fillcolor = "#ffffff"];
"/nix/store/6kslnirvm26fij7wpjqbw617ri4gf5x5-gcc-4.7.2.tar.xz-guile-builder" -> "/nix/store/fl9cwcczfdv73vq5sr0c4rd5hqzrgvac-gcc-4.7.2.tar.xz.drv" [color = "magenta"];
"/nix/store/kvk5wp8c9rzvvrmq5fv5r58l78q8i6ch-module-import.drv" -> "/nix/store/fl9cwcczfdv73vq5sr0c4rd5hqzrgvac-gcc-4.7.2.tar.xz.drv" [color = "burlywood"];
"/nix/store/pzv319p3q7raiad7nq7fcdw9rafzp14k-module-import-compiled.drv" -> "/nix/store/fl9cwcczfdv73vq5sr0c4rd5hqzrgvac-gcc-4.7.2.tar.xz.drv" [color = "black"];
"/nix/store/x9x1a86flhx15cams7235rfy5gc5cww1-guile-bootstrap-2.0.drv" -> "/nix/store/fl9cwcczfdv73vq5sr0c4rd5hqzrgvac-gcc-4.7.2.tar.xz.drv" [color = "red"];
-"/nix/store/6kslnirvm26fij7wpjqbw617ri4gf5x5-gcc-4.7.2.tar.xz-guile-builder" [label = "gcc-4.7.2.tar.xz-guile-builder", fontname = Helvetica, shape = box, style = filled, fillcolor = "#ffffff"];
-"/nix/store/jaaqdl979wjirnbxz1jqsipg22nva5n4-bash" [label = "bash", fontname = Helvetica, shape = box, style = filled, fillcolor = "#ffffff"];
-"/nix/store/kvk5wp8c9rzvvrmq5fv5r58l78q8i6ch-module-import.drv" [label = "module-import.drv", fontname = Helvetica, shape = box, style = filled, fillcolor = "#ffffff"];
+"/nix/store/6kslnirvm26fij7wpjqbw617ri4gf5x5-gcc-4.7.2.tar.xz-guile-builder" [label = "gcc-4.7.2.tar.xz-guile-builder", fontname = "dejavu sans", shape = box, style = filled, fillcolor = "#ffffff"];
+"/nix/store/jaaqdl979wjirnbxz1jqsipg22nva5n4-bash" [label = "bash", fontname = "dejavu sans", shape = box, style = filled, fillcolor = "#ffffff"];
+"/nix/store/kvk5wp8c9rzvvrmq5fv5r58l78q8i6ch-module-import.drv" [label = "module-import.drv", fontname = "dejavu sans", shape = box, style = filled, fillcolor = "#ffffff"];
"/nix/store/abagrdbdndkd0y2dwk0nw1gw0g0rhl2z-ftp-client.scm" -> "/nix/store/kvk5wp8c9rzvvrmq5fv5r58l78q8i6ch-module-import.drv" [color = "green"];
"/nix/store/dwd2iwd1ban8a8rmx568dpgrbkkidfhw-download.scm" -> "/nix/store/kvk5wp8c9rzvvrmq5fv5r58l78q8i6ch-module-import.drv" [color = "blue"];
"/nix/store/mj7amprgvl2rgash1nr0v64apik8vc7f-utils.scm" -> "/nix/store/kvk5wp8c9rzvvrmq5fv5r58l78q8i6ch-module-import.drv" [color = "magenta"];
"/nix/store/x9x1a86flhx15cams7235rfy5gc5cww1-guile-bootstrap-2.0.drv" -> "/nix/store/kvk5wp8c9rzvvrmq5fv5r58l78q8i6ch-module-import.drv" [color = "burlywood"];
"/nix/store/yfixjx2gpvsi5dhkpdx5gj6gx0xdk1c8-module-import-guile-builder" -> "/nix/store/kvk5wp8c9rzvvrmq5fv5r58l78q8i6ch-module-import.drv" [color = "black"];
-"/nix/store/abagrdbdndkd0y2dwk0nw1gw0g0rhl2z-ftp-client.scm" [label = "ftp-client.scm", fontname = Helvetica, shape = box, style = filled, fillcolor = "#ffffff"];
-"/nix/store/dwd2iwd1ban8a8rmx568dpgrbkkidfhw-download.scm" [label = "download.scm", fontname = Helvetica, shape = box, style = filled, fillcolor = "#ffffff"];
-"/nix/store/mj7amprgvl2rgash1nr0v64apik8vc7f-utils.scm" [label = "utils.scm", fontname = Helvetica, shape = box, style = filled, fillcolor = "#ffffff"];
-"/nix/store/pzv319p3q7raiad7nq7fcdw9rafzp14k-module-import-compiled.drv" [label = "module-import-compiled.drv", fontname = Helvetica, shape = box, style = filled, fillcolor = "#ffffff"];
+"/nix/store/abagrdbdndkd0y2dwk0nw1gw0g0rhl2z-ftp-client.scm" [label = "ftp-client.scm", fontname = "dejavu sans", shape = box, style = filled, fillcolor = "#ffffff"];
+"/nix/store/dwd2iwd1ban8a8rmx568dpgrbkkidfhw-download.scm" [label = "download.scm", fontname = "dejavu sans", shape = box, style = filled, fillcolor = "#ffffff"];
+"/nix/store/mj7amprgvl2rgash1nr0v64apik8vc7f-utils.scm" [label = "utils.scm", fontname = "dejavu sans", shape = box, style = filled, fillcolor = "#ffffff"];
+"/nix/store/pzv319p3q7raiad7nq7fcdw9rafzp14k-module-import-compiled.drv" [label = "module-import-compiled.drv", fontname = "dejavu sans", shape = box, style = filled, fillcolor = "#ffffff"];
"/nix/store/98gzqlgpm4gxrpl5bzykpqbwrx8ckx8l-module-import-compiled-guile-builder" -> "/nix/store/pzv319p3q7raiad7nq7fcdw9rafzp14k-module-import-compiled.drv" [color = "red"];
"/nix/store/kvk5wp8c9rzvvrmq5fv5r58l78q8i6ch-module-import.drv" -> "/nix/store/pzv319p3q7raiad7nq7fcdw9rafzp14k-module-import-compiled.drv" [color = "green"];
"/nix/store/x9x1a86flhx15cams7235rfy5gc5cww1-guile-bootstrap-2.0.drv" -> "/nix/store/pzv319p3q7raiad7nq7fcdw9rafzp14k-module-import-compiled.drv" [color = "blue"];
-"/nix/store/98gzqlgpm4gxrpl5bzykpqbwrx8ckx8l-module-import-compiled-guile-builder" [label = "module-import-compiled-guile-builder", fontname = Helvetica, shape = box, style = filled, fillcolor = "#ffffff"];
-"/nix/store/r3dsy5j2c16sv26raala6kahff7w18hb-gcc-bootstrap-0-guile-builder" [label = "gcc-bootstrap-0-guile-builder", fontname = Helvetica, shape = box, style = filled, fillcolor = "#ffffff"];
+"/nix/store/98gzqlgpm4gxrpl5bzykpqbwrx8ckx8l-module-import-compiled-guile-builder" [label = "module-import-compiled-guile-builder", fontname = "dejavu sans", shape = box, style = filled, fillcolor = "#ffffff"];
+"/nix/store/r3dsy5j2c16sv26raala6kahff7w18hb-gcc-bootstrap-0-guile-builder" [label = "gcc-bootstrap-0-guile-builder", fontname = "dejavu sans", shape = box, style = filled, fillcolor = "#ffffff"];
"/nix/store/3iawic1z95112yfz5y9xdp66qbxxr8l1-tar" -> "/nix/store/r3dsy5j2c16sv26raala6kahff7w18hb-gcc-bootstrap-0-guile-builder" [color = "magenta"];
"/nix/store/8cc81w6m04csm52y247xj3gydrbz2niv-xz" -> "/nix/store/r3dsy5j2c16sv26raala6kahff7w18hb-gcc-bootstrap-0-guile-builder" [color = "burlywood"];
"/nix/store/jaaqdl979wjirnbxz1jqsipg22nva5n4-bash" -> "/nix/store/r3dsy5j2c16sv26raala6kahff7w18hb-gcc-bootstrap-0-guile-builder" [color = "black"];
-"/nix/store/wdwrkg02gn28bkpbxgdb2nv558v8s3ji-glibc-2.17.tar.xz.drv" [label = "glibc-2.17.tar.xz.drv", fontname = Helvetica, shape = box, style = filled, fillcolor = "#ffffff"];
+"/nix/store/wdwrkg02gn28bkpbxgdb2nv558v8s3ji-glibc-2.17.tar.xz.drv" [label = "glibc-2.17.tar.xz.drv", fontname = "dejavu sans", shape = box, style = filled, fillcolor = "#ffffff"];
"/nix/store/kvk5wp8c9rzvvrmq5fv5r58l78q8i6ch-module-import.drv" -> "/nix/store/wdwrkg02gn28bkpbxgdb2nv558v8s3ji-glibc-2.17.tar.xz.drv" [color = "red"];
"/nix/store/pzv319p3q7raiad7nq7fcdw9rafzp14k-module-import-compiled.drv" -> "/nix/store/wdwrkg02gn28bkpbxgdb2nv558v8s3ji-glibc-2.17.tar.xz.drv" [color = "green"];
"/nix/store/q7as3jddipj4g6si8lawrdbkjg0zcjvg-glibc-2.17.tar.xz-guile-builder" -> "/nix/store/wdwrkg02gn28bkpbxgdb2nv558v8s3ji-glibc-2.17.tar.xz.drv" [color = "blue"];
"/nix/store/x9x1a86flhx15cams7235rfy5gc5cww1-guile-bootstrap-2.0.drv" -> "/nix/store/wdwrkg02gn28bkpbxgdb2nv558v8s3ji-glibc-2.17.tar.xz.drv" [color = "magenta"];
-"/nix/store/q7as3jddipj4g6si8lawrdbkjg0zcjvg-glibc-2.17.tar.xz-guile-builder" [label = "glibc-2.17.tar.xz-guile-builder", fontname = Helvetica, shape = box, style = filled, fillcolor = "#ffffff"];
-"/nix/store/x9x1a86flhx15cams7235rfy5gc5cww1-guile-bootstrap-2.0.drv" [label = "guile-bootstrap-2.0.drv", fontname = Helvetica, shape = box, style = filled, fillcolor = "#ffffff"];
+"/nix/store/q7as3jddipj4g6si8lawrdbkjg0zcjvg-glibc-2.17.tar.xz-guile-builder" [label = "glibc-2.17.tar.xz-guile-builder", fontname = "dejavu sans", shape = box, style = filled, fillcolor = "#ffffff"];
+"/nix/store/x9x1a86flhx15cams7235rfy5gc5cww1-guile-bootstrap-2.0.drv" [label = "guile-bootstrap-2.0.drv", fontname = "dejavu sans", shape = box, style = filled, fillcolor = "#ffffff"];
"/nix/store/bplka3yqdg8prqq3zdxza6wxlkjdhr2g-build-bootstrap-guile.sh" -> "/nix/store/x9x1a86flhx15cams7235rfy5gc5cww1-guile-bootstrap-2.0.drv" [color = "burlywood"];
"/nix/store/jaaqdl979wjirnbxz1jqsipg22nva5n4-bash" -> "/nix/store/x9x1a86flhx15cams7235rfy5gc5cww1-guile-bootstrap-2.0.drv" [color = "black"];
-"/nix/store/bplka3yqdg8prqq3zdxza6wxlkjdhr2g-build-bootstrap-guile.sh" [label = "build-bootstrap-guile.sh", fontname = Helvetica, shape = box, style = filled, fillcolor = "#ffffff"];
+"/nix/store/bplka3yqdg8prqq3zdxza6wxlkjdhr2g-build-bootstrap-guile.sh" [label = "build-bootstrap-guile.sh", fontname = "dejavu sans", shape = box, style = filled, fillcolor = "#ffffff"];
"/nix/store/3iawic1z95112yfz5y9xdp66qbxxr8l1-tar" -> "/nix/store/bplka3yqdg8prqq3zdxza6wxlkjdhr2g-build-bootstrap-guile.sh" [color = "red"];
"/nix/store/4xv2y0m6zr2lgi8x8pcb3zxjqxsz69kj-mkdir" -> "/nix/store/bplka3yqdg8prqq3zdxza6wxlkjdhr2g-build-bootstrap-guile.sh" [color = "green"];
"/nix/store/8cc81w6m04csm52y247xj3gydrbz2niv-xz" -> "/nix/store/bplka3yqdg8prqq3zdxza6wxlkjdhr2g-build-bootstrap-guile.sh" [color = "blue"];
"/nix/store/c450lqvaaz3ngx9pfiiiw55rqq6ssfda-guile-2.0.7.tar.xz" -> "/nix/store/bplka3yqdg8prqq3zdxza6wxlkjdhr2g-build-bootstrap-guile.sh" [color = "magenta"];
-"/nix/store/4xv2y0m6zr2lgi8x8pcb3zxjqxsz69kj-mkdir" [label = "mkdir", fontname = Helvetica, shape = box, style = filled, fillcolor = "#ffffff"];
-"/nix/store/c450lqvaaz3ngx9pfiiiw55rqq6ssfda-guile-2.0.7.tar.xz" [label = "guile-2.0.7.tar.xz", fontname = Helvetica, shape = box, style = filled, fillcolor = "#ffffff"];
-"/nix/store/y4n7rzysx6qz3p0n91dw9qz5w93l6iqv-module-import-compiled.drv" [label = "module-import-compiled.drv", fontname = Helvetica, shape = box, style = filled, fillcolor = "#ffffff"];
+"/nix/store/4xv2y0m6zr2lgi8x8pcb3zxjqxsz69kj-mkdir" [label = "mkdir", fontname = "dejavu sans", shape = box, style = filled, fillcolor = "#ffffff"];
+"/nix/store/c450lqvaaz3ngx9pfiiiw55rqq6ssfda-guile-2.0.7.tar.xz" [label = "guile-2.0.7.tar.xz", fontname = "dejavu sans", shape = box, style = filled, fillcolor = "#ffffff"];
+"/nix/store/y4n7rzysx6qz3p0n91dw9qz5w93l6iqv-module-import-compiled.drv" [label = "module-import-compiled.drv", fontname = "dejavu sans", shape = box, style = filled, fillcolor = "#ffffff"];
"/nix/store/8jiqjlb6zxjys16ca7s6jvxcc620c71k-module-import-compiled-guile-builder" -> "/nix/store/y4n7rzysx6qz3p0n91dw9qz5w93l6iqv-module-import-compiled.drv" [color = "burlywood"];
"/nix/store/96yx6013dhggr3mpg5ayxv8dm9mv2ghv-module-import.drv" -> "/nix/store/y4n7rzysx6qz3p0n91dw9qz5w93l6iqv-module-import-compiled.drv" [color = "black"];
"/nix/store/x9x1a86flhx15cams7235rfy5gc5cww1-guile-bootstrap-2.0.drv" -> "/nix/store/y4n7rzysx6qz3p0n91dw9qz5w93l6iqv-module-import-compiled.drv" [color = "red"];
-"/nix/store/8jiqjlb6zxjys16ca7s6jvxcc620c71k-module-import-compiled-guile-builder" [label = "module-import-compiled-guile-builder", fontname = Helvetica, shape = box, style = filled, fillcolor = "#ffffff"];
-"/nix/store/yfixjx2gpvsi5dhkpdx5gj6gx0xdk1c8-module-import-guile-builder" [label = "module-import-guile-builder", fontname = Helvetica, shape = box, style = filled, fillcolor = "#ffffff"];
+"/nix/store/8jiqjlb6zxjys16ca7s6jvxcc620c71k-module-import-compiled-guile-builder" [label = "module-import-compiled-guile-builder", fontname = "dejavu sans", shape = box, style = filled, fillcolor = "#ffffff"];
+"/nix/store/yfixjx2gpvsi5dhkpdx5gj6gx0xdk1c8-module-import-guile-builder" [label = "module-import-guile-builder", fontname = "dejavu sans", shape = box, style = filled, fillcolor = "#ffffff"];
"/nix/store/abagrdbdndkd0y2dwk0nw1gw0g0rhl2z-ftp-client.scm" -> "/nix/store/yfixjx2gpvsi5dhkpdx5gj6gx0xdk1c8-module-import-guile-builder" [color = "green"];
"/nix/store/dwd2iwd1ban8a8rmx568dpgrbkkidfhw-download.scm" -> "/nix/store/yfixjx2gpvsi5dhkpdx5gj6gx0xdk1c8-module-import-guile-builder" [color = "blue"];
"/nix/store/mj7amprgvl2rgash1nr0v64apik8vc7f-utils.scm" -> "/nix/store/yfixjx2gpvsi5dhkpdx5gj6gx0xdk1c8-module-import-guile-builder" [color = "magenta"];
diff --git a/doc/images/bootstrap-packages.dot b/doc/images/bootstrap-packages.dot
index 8b2df068a8..579bbcd00f 100644
--- a/doc/images/bootstrap-packages.dot
+++ b/doc/images/bootstrap-packages.dot
@@ -1,5 +1,5 @@
digraph "Guix bag" {
- "/gnu/store/aymf6jlxxpwgr71rkiz24m646nqsyii6-glibc-intermediate-2.24.drv" [label = "glibc-intermediate-2.24", shape = box, fontname = Helvetica];
+ "/gnu/store/aymf6jlxxpwgr71rkiz24m646nqsyii6-glibc-intermediate-2.24.drv" [label = "glibc-intermediate-2.24", shape = box, fontname = "dejavu sans"];
"/gnu/store/aymf6jlxxpwgr71rkiz24m646nqsyii6-glibc-intermediate-2.24.drv" -> "/gnu/store/wx8ifbb7x22cl4998fyldsr24fcv18j3-texinfo-6.3.drv" [color = magenta];
"/gnu/store/aymf6jlxxpwgr71rkiz24m646nqsyii6-glibc-intermediate-2.24.drv" -> "/gnu/store/ccj3as3258l70lmphi48hs7n017wv75s-perl-boot0-5.24.0.drv" [color = magenta];
"/gnu/store/aymf6jlxxpwgr71rkiz24m646nqsyii6-glibc-intermediate-2.24.drv" -> "/gnu/store/w9adgzgdqkwz0w13zxf2fn363v9wcllc-gcc-cross-boot0-4.9.4.drv" [color = magenta];
@@ -16,7 +16,7 @@ digraph "Guix bag" {
"/gnu/store/aymf6jlxxpwgr71rkiz24m646nqsyii6-glibc-intermediate-2.24.drv" -> "/gnu/store/jxlg2pb4bhxjld9kimc0vgc1pvgifzag-gcc-bootstrap-0.drv" [color = magenta];
"/gnu/store/aymf6jlxxpwgr71rkiz24m646nqsyii6-glibc-intermediate-2.24.drv" -> "/gnu/store/pmvh852v0x1zbl4r37pcpdqnq6m3bwfk-bootstrap-binaries-0.drv" [color = magenta];
"/gnu/store/aymf6jlxxpwgr71rkiz24m646nqsyii6-glibc-intermediate-2.24.drv" -> "/gnu/store/5syba2bxhh8z79jhq83fzy8fxcx5xb4s-linux-libre-headers-4.4.18.drv" [color = magenta];
- "/gnu/store/wx8ifbb7x22cl4998fyldsr24fcv18j3-texinfo-6.3.drv" [label = "texinfo-6.3", shape = box, fontname = Helvetica];
+ "/gnu/store/wx8ifbb7x22cl4998fyldsr24fcv18j3-texinfo-6.3.drv" [label = "texinfo-6.3", shape = box, fontname = "dejavu sans"];
"/gnu/store/wx8ifbb7x22cl4998fyldsr24fcv18j3-texinfo-6.3.drv" -> "/gnu/store/1jpld53g41rzv2bmjp6v9mckmyw75vs3-make-boot0-4.2.1.drv" [color = cyan3];
"/gnu/store/wx8ifbb7x22cl4998fyldsr24fcv18j3-texinfo-6.3.drv" -> "/gnu/store/zpphawi07xidhfs2dja3w7hmnfp99j02-diffutils-boot0-3.5.drv" [color = cyan3];
"/gnu/store/wx8ifbb7x22cl4998fyldsr24fcv18j3-texinfo-6.3.drv" -> "/gnu/store/m4900ip34w4rcgn5620iqdi1wv198d9s-findutils-boot0-4.6.0.drv" [color = cyan3];
@@ -27,25 +27,25 @@ digraph "Guix bag" {
"/gnu/store/wx8ifbb7x22cl4998fyldsr24fcv18j3-texinfo-6.3.drv" -> "/gnu/store/pmvh852v0x1zbl4r37pcpdqnq6m3bwfk-bootstrap-binaries-0.drv" [color = cyan3];
"/gnu/store/wx8ifbb7x22cl4998fyldsr24fcv18j3-texinfo-6.3.drv" -> "/gnu/store/pmvh852v0x1zbl4r37pcpdqnq6m3bwfk-bootstrap-binaries-0.drv" [color = cyan3];
"/gnu/store/wx8ifbb7x22cl4998fyldsr24fcv18j3-texinfo-6.3.drv" -> "/gnu/store/ccj3as3258l70lmphi48hs7n017wv75s-perl-boot0-5.24.0.drv" [color = cyan3];
- "/gnu/store/1jpld53g41rzv2bmjp6v9mckmyw75vs3-make-boot0-4.2.1.drv" [label = "make-boot0-4.2.1", shape = box, fontname = Helvetica];
+ "/gnu/store/1jpld53g41rzv2bmjp6v9mckmyw75vs3-make-boot0-4.2.1.drv" [label = "make-boot0-4.2.1", shape = box, fontname = "dejavu sans"];
"/gnu/store/1jpld53g41rzv2bmjp6v9mckmyw75vs3-make-boot0-4.2.1.drv" -> "/gnu/store/wda0p45jlbzg6w9j8zxw2sd11n2a4pbv-glibc-bootstrap-0.drv" [color = dimgrey];
"/gnu/store/1jpld53g41rzv2bmjp6v9mckmyw75vs3-make-boot0-4.2.1.drv" -> "/gnu/store/jxlg2pb4bhxjld9kimc0vgc1pvgifzag-gcc-bootstrap-0.drv" [color = dimgrey];
"/gnu/store/1jpld53g41rzv2bmjp6v9mckmyw75vs3-make-boot0-4.2.1.drv" -> "/gnu/store/wv8sf8h4n9s5cdya223iy2wp3alr92x8-binutils-bootstrap-0.drv" [color = dimgrey];
"/gnu/store/1jpld53g41rzv2bmjp6v9mckmyw75vs3-make-boot0-4.2.1.drv" -> "/gnu/store/pmvh852v0x1zbl4r37pcpdqnq6m3bwfk-bootstrap-binaries-0.drv" [color = dimgrey];
"/gnu/store/1jpld53g41rzv2bmjp6v9mckmyw75vs3-make-boot0-4.2.1.drv" -> "/gnu/store/pmvh852v0x1zbl4r37pcpdqnq6m3bwfk-bootstrap-binaries-0.drv" [color = dimgrey];
- "/gnu/store/wda0p45jlbzg6w9j8zxw2sd11n2a4pbv-glibc-bootstrap-0.drv" [label = "glibc-bootstrap-0", shape = box, fontname = Helvetica];
- "/gnu/store/jxlg2pb4bhxjld9kimc0vgc1pvgifzag-gcc-bootstrap-0.drv" [label = "gcc-bootstrap-0", shape = box, fontname = Helvetica];
+ "/gnu/store/wda0p45jlbzg6w9j8zxw2sd11n2a4pbv-glibc-bootstrap-0.drv" [label = "glibc-bootstrap-0", shape = box, fontname = "dejavu sans"];
+ "/gnu/store/jxlg2pb4bhxjld9kimc0vgc1pvgifzag-gcc-bootstrap-0.drv" [label = "gcc-bootstrap-0", shape = box, fontname = "dejavu sans"];
"/gnu/store/jxlg2pb4bhxjld9kimc0vgc1pvgifzag-gcc-bootstrap-0.drv" -> "/gnu/store/wda0p45jlbzg6w9j8zxw2sd11n2a4pbv-glibc-bootstrap-0.drv" [color = darkseagreen];
- "/gnu/store/wv8sf8h4n9s5cdya223iy2wp3alr92x8-binutils-bootstrap-0.drv" [label = "binutils-bootstrap-0", shape = box, fontname = Helvetica];
- "/gnu/store/pmvh852v0x1zbl4r37pcpdqnq6m3bwfk-bootstrap-binaries-0.drv" [label = "bootstrap-binaries-0", shape = box, fontname = Helvetica];
- "/gnu/store/zpphawi07xidhfs2dja3w7hmnfp99j02-diffutils-boot0-3.5.drv" [label = "diffutils-boot0-3.5", shape = box, fontname = Helvetica];
+ "/gnu/store/wv8sf8h4n9s5cdya223iy2wp3alr92x8-binutils-bootstrap-0.drv" [label = "binutils-bootstrap-0", shape = box, fontname = "dejavu sans"];
+ "/gnu/store/pmvh852v0x1zbl4r37pcpdqnq6m3bwfk-bootstrap-binaries-0.drv" [label = "bootstrap-binaries-0", shape = box, fontname = "dejavu sans"];
+ "/gnu/store/zpphawi07xidhfs2dja3w7hmnfp99j02-diffutils-boot0-3.5.drv" [label = "diffutils-boot0-3.5", shape = box, fontname = "dejavu sans"];
"/gnu/store/zpphawi07xidhfs2dja3w7hmnfp99j02-diffutils-boot0-3.5.drv" -> "/gnu/store/1jpld53g41rzv2bmjp6v9mckmyw75vs3-make-boot0-4.2.1.drv" [color = blue];
"/gnu/store/zpphawi07xidhfs2dja3w7hmnfp99j02-diffutils-boot0-3.5.drv" -> "/gnu/store/wda0p45jlbzg6w9j8zxw2sd11n2a4pbv-glibc-bootstrap-0.drv" [color = blue];
"/gnu/store/zpphawi07xidhfs2dja3w7hmnfp99j02-diffutils-boot0-3.5.drv" -> "/gnu/store/jxlg2pb4bhxjld9kimc0vgc1pvgifzag-gcc-bootstrap-0.drv" [color = blue];
"/gnu/store/zpphawi07xidhfs2dja3w7hmnfp99j02-diffutils-boot0-3.5.drv" -> "/gnu/store/wv8sf8h4n9s5cdya223iy2wp3alr92x8-binutils-bootstrap-0.drv" [color = blue];
"/gnu/store/zpphawi07xidhfs2dja3w7hmnfp99j02-diffutils-boot0-3.5.drv" -> "/gnu/store/pmvh852v0x1zbl4r37pcpdqnq6m3bwfk-bootstrap-binaries-0.drv" [color = blue];
"/gnu/store/zpphawi07xidhfs2dja3w7hmnfp99j02-diffutils-boot0-3.5.drv" -> "/gnu/store/pmvh852v0x1zbl4r37pcpdqnq6m3bwfk-bootstrap-binaries-0.drv" [color = blue];
- "/gnu/store/m4900ip34w4rcgn5620iqdi1wv198d9s-findutils-boot0-4.6.0.drv" [label = "findutils-boot0-4.6.0", shape = box, fontname = Helvetica];
+ "/gnu/store/m4900ip34w4rcgn5620iqdi1wv198d9s-findutils-boot0-4.6.0.drv" [label = "findutils-boot0-4.6.0", shape = box, fontname = "dejavu sans"];
"/gnu/store/m4900ip34w4rcgn5620iqdi1wv198d9s-findutils-boot0-4.6.0.drv" -> "/gnu/store/1jpld53g41rzv2bmjp6v9mckmyw75vs3-make-boot0-4.2.1.drv" [color = blue];
"/gnu/store/m4900ip34w4rcgn5620iqdi1wv198d9s-findutils-boot0-4.6.0.drv" -> "/gnu/store/zpphawi07xidhfs2dja3w7hmnfp99j02-diffutils-boot0-3.5.drv" [color = blue];
"/gnu/store/m4900ip34w4rcgn5620iqdi1wv198d9s-findutils-boot0-4.6.0.drv" -> "/gnu/store/wda0p45jlbzg6w9j8zxw2sd11n2a4pbv-glibc-bootstrap-0.drv" [color = blue];
@@ -53,14 +53,14 @@ digraph "Guix bag" {
"/gnu/store/m4900ip34w4rcgn5620iqdi1wv198d9s-findutils-boot0-4.6.0.drv" -> "/gnu/store/wv8sf8h4n9s5cdya223iy2wp3alr92x8-binutils-bootstrap-0.drv" [color = blue];
"/gnu/store/m4900ip34w4rcgn5620iqdi1wv198d9s-findutils-boot0-4.6.0.drv" -> "/gnu/store/pmvh852v0x1zbl4r37pcpdqnq6m3bwfk-bootstrap-binaries-0.drv" [color = blue];
"/gnu/store/m4900ip34w4rcgn5620iqdi1wv198d9s-findutils-boot0-4.6.0.drv" -> "/gnu/store/pmvh852v0x1zbl4r37pcpdqnq6m3bwfk-bootstrap-binaries-0.drv" [color = blue];
- "/gnu/store/nwzyr3xskw0ms8cndffsfvhvm5xz96pc-file-boot0-5.28.drv" [label = "file-boot0-5.28", shape = box, fontname = Helvetica];
+ "/gnu/store/nwzyr3xskw0ms8cndffsfvhvm5xz96pc-file-boot0-5.28.drv" [label = "file-boot0-5.28", shape = box, fontname = "dejavu sans"];
"/gnu/store/nwzyr3xskw0ms8cndffsfvhvm5xz96pc-file-boot0-5.28.drv" -> "/gnu/store/1jpld53g41rzv2bmjp6v9mckmyw75vs3-make-boot0-4.2.1.drv" [color = darkgoldenrod];
"/gnu/store/nwzyr3xskw0ms8cndffsfvhvm5xz96pc-file-boot0-5.28.drv" -> "/gnu/store/wda0p45jlbzg6w9j8zxw2sd11n2a4pbv-glibc-bootstrap-0.drv" [color = darkgoldenrod];
"/gnu/store/nwzyr3xskw0ms8cndffsfvhvm5xz96pc-file-boot0-5.28.drv" -> "/gnu/store/jxlg2pb4bhxjld9kimc0vgc1pvgifzag-gcc-bootstrap-0.drv" [color = darkgoldenrod];
"/gnu/store/nwzyr3xskw0ms8cndffsfvhvm5xz96pc-file-boot0-5.28.drv" -> "/gnu/store/wv8sf8h4n9s5cdya223iy2wp3alr92x8-binutils-bootstrap-0.drv" [color = darkgoldenrod];
"/gnu/store/nwzyr3xskw0ms8cndffsfvhvm5xz96pc-file-boot0-5.28.drv" -> "/gnu/store/pmvh852v0x1zbl4r37pcpdqnq6m3bwfk-bootstrap-binaries-0.drv" [color = darkgoldenrod];
"/gnu/store/nwzyr3xskw0ms8cndffsfvhvm5xz96pc-file-boot0-5.28.drv" -> "/gnu/store/pmvh852v0x1zbl4r37pcpdqnq6m3bwfk-bootstrap-binaries-0.drv" [color = darkgoldenrod];
- "/gnu/store/ccj3as3258l70lmphi48hs7n017wv75s-perl-boot0-5.24.0.drv" [label = "perl-boot0-5.24.0", shape = box, fontname = Helvetica];
+ "/gnu/store/ccj3as3258l70lmphi48hs7n017wv75s-perl-boot0-5.24.0.drv" [label = "perl-boot0-5.24.0", shape = box, fontname = "dejavu sans"];
"/gnu/store/ccj3as3258l70lmphi48hs7n017wv75s-perl-boot0-5.24.0.drv" -> "/gnu/store/1jpld53g41rzv2bmjp6v9mckmyw75vs3-make-boot0-4.2.1.drv" [color = peachpuff4];
"/gnu/store/ccj3as3258l70lmphi48hs7n017wv75s-perl-boot0-5.24.0.drv" -> "/gnu/store/zpphawi07xidhfs2dja3w7hmnfp99j02-diffutils-boot0-3.5.drv" [color = peachpuff4];
"/gnu/store/ccj3as3258l70lmphi48hs7n017wv75s-perl-boot0-5.24.0.drv" -> "/gnu/store/m4900ip34w4rcgn5620iqdi1wv198d9s-findutils-boot0-4.6.0.drv" [color = peachpuff4];
@@ -70,7 +70,7 @@ digraph "Guix bag" {
"/gnu/store/ccj3as3258l70lmphi48hs7n017wv75s-perl-boot0-5.24.0.drv" -> "/gnu/store/wv8sf8h4n9s5cdya223iy2wp3alr92x8-binutils-bootstrap-0.drv" [color = peachpuff4];
"/gnu/store/ccj3as3258l70lmphi48hs7n017wv75s-perl-boot0-5.24.0.drv" -> "/gnu/store/pmvh852v0x1zbl4r37pcpdqnq6m3bwfk-bootstrap-binaries-0.drv" [color = peachpuff4];
"/gnu/store/ccj3as3258l70lmphi48hs7n017wv75s-perl-boot0-5.24.0.drv" -> "/gnu/store/pmvh852v0x1zbl4r37pcpdqnq6m3bwfk-bootstrap-binaries-0.drv" [color = peachpuff4];
- "/gnu/store/w9adgzgdqkwz0w13zxf2fn363v9wcllc-gcc-cross-boot0-4.9.4.drv" [label = "gcc-cross-boot0-4.9.4", shape = box, fontname = Helvetica];
+ "/gnu/store/w9adgzgdqkwz0w13zxf2fn363v9wcllc-gcc-cross-boot0-4.9.4.drv" [label = "gcc-cross-boot0-4.9.4", shape = box, fontname = "dejavu sans"];
"/gnu/store/w9adgzgdqkwz0w13zxf2fn363v9wcllc-gcc-cross-boot0-4.9.4.drv" -> "/gnu/store/v1v7jp438hc5rpgriwpjp04x049vh0g4-binutils-cross-boot0-2.27.drv" [color = darkseagreen];
"/gnu/store/w9adgzgdqkwz0w13zxf2fn363v9wcllc-gcc-cross-boot0-4.9.4.drv" -> "/gnu/store/wda0p45jlbzg6w9j8zxw2sd11n2a4pbv-glibc-bootstrap-0.drv" [color = darkseagreen];
"/gnu/store/w9adgzgdqkwz0w13zxf2fn363v9wcllc-gcc-cross-boot0-4.9.4.drv" -> "/gnu/store/1jpld53g41rzv2bmjp6v9mckmyw75vs3-make-boot0-4.2.1.drv" [color = darkseagreen];
@@ -81,7 +81,7 @@ digraph "Guix bag" {
"/gnu/store/w9adgzgdqkwz0w13zxf2fn363v9wcllc-gcc-cross-boot0-4.9.4.drv" -> "/gnu/store/wv8sf8h4n9s5cdya223iy2wp3alr92x8-binutils-bootstrap-0.drv" [color = darkseagreen];
"/gnu/store/w9adgzgdqkwz0w13zxf2fn363v9wcllc-gcc-cross-boot0-4.9.4.drv" -> "/gnu/store/pmvh852v0x1zbl4r37pcpdqnq6m3bwfk-bootstrap-binaries-0.drv" [color = darkseagreen];
"/gnu/store/w9adgzgdqkwz0w13zxf2fn363v9wcllc-gcc-cross-boot0-4.9.4.drv" -> "/gnu/store/pmvh852v0x1zbl4r37pcpdqnq6m3bwfk-bootstrap-binaries-0.drv" [color = darkseagreen];
- "/gnu/store/v1v7jp438hc5rpgriwpjp04x049vh0g4-binutils-cross-boot0-2.27.drv" [label = "binutils-cross-boot0-2.27", shape = box, fontname = Helvetica];
+ "/gnu/store/v1v7jp438hc5rpgriwpjp04x049vh0g4-binutils-cross-boot0-2.27.drv" [label = "binutils-cross-boot0-2.27", shape = box, fontname = "dejavu sans"];
"/gnu/store/v1v7jp438hc5rpgriwpjp04x049vh0g4-binutils-cross-boot0-2.27.drv" -> "/gnu/store/1jpld53g41rzv2bmjp6v9mckmyw75vs3-make-boot0-4.2.1.drv" [color = dimgrey];
"/gnu/store/v1v7jp438hc5rpgriwpjp04x049vh0g4-binutils-cross-boot0-2.27.drv" -> "/gnu/store/zpphawi07xidhfs2dja3w7hmnfp99j02-diffutils-boot0-3.5.drv" [color = dimgrey];
"/gnu/store/v1v7jp438hc5rpgriwpjp04x049vh0g4-binutils-cross-boot0-2.27.drv" -> "/gnu/store/m4900ip34w4rcgn5620iqdi1wv198d9s-findutils-boot0-4.6.0.drv" [color = dimgrey];
@@ -91,12 +91,12 @@ digraph "Guix bag" {
"/gnu/store/v1v7jp438hc5rpgriwpjp04x049vh0g4-binutils-cross-boot0-2.27.drv" -> "/gnu/store/wv8sf8h4n9s5cdya223iy2wp3alr92x8-binutils-bootstrap-0.drv" [color = dimgrey];
"/gnu/store/v1v7jp438hc5rpgriwpjp04x049vh0g4-binutils-cross-boot0-2.27.drv" -> "/gnu/store/pmvh852v0x1zbl4r37pcpdqnq6m3bwfk-bootstrap-binaries-0.drv" [color = dimgrey];
"/gnu/store/v1v7jp438hc5rpgriwpjp04x049vh0g4-binutils-cross-boot0-2.27.drv" -> "/gnu/store/pmvh852v0x1zbl4r37pcpdqnq6m3bwfk-bootstrap-binaries-0.drv" [color = dimgrey];
- "/gnu/store/72snmrnjphwjxffknjhzm3xg38wd08al-ld-wrapper-x86_64-guix-linux-gnu-0.drv" [label = "ld-wrapper-x86_64-guix-linux-gnu-0", shape = box, fontname = Helvetica];
+ "/gnu/store/72snmrnjphwjxffknjhzm3xg38wd08al-ld-wrapper-x86_64-guix-linux-gnu-0.drv" [label = "ld-wrapper-x86_64-guix-linux-gnu-0", shape = box, fontname = "dejavu sans"];
"/gnu/store/72snmrnjphwjxffknjhzm3xg38wd08al-ld-wrapper-x86_64-guix-linux-gnu-0.drv" -> "/gnu/store/v1v7jp438hc5rpgriwpjp04x049vh0g4-binutils-cross-boot0-2.27.drv" [color = dimgrey];
"/gnu/store/72snmrnjphwjxffknjhzm3xg38wd08al-ld-wrapper-x86_64-guix-linux-gnu-0.drv" -> "/gnu/store/af19ma2vm3qhvh3rw6cdivyp98s18bj3-guile-bootstrap-2.0.drv" [color = dimgrey];
"/gnu/store/72snmrnjphwjxffknjhzm3xg38wd08al-ld-wrapper-x86_64-guix-linux-gnu-0.drv" -> "/gnu/store/pmvh852v0x1zbl4r37pcpdqnq6m3bwfk-bootstrap-binaries-0.drv" [color = dimgrey];
- "/gnu/store/af19ma2vm3qhvh3rw6cdivyp98s18bj3-guile-bootstrap-2.0.drv" [label = "guile-bootstrap-2.0", shape = box, fontname = Helvetica];
- "/gnu/store/5syba2bxhh8z79jhq83fzy8fxcx5xb4s-linux-libre-headers-4.4.18.drv" [label = "linux-libre-headers-4.4.18", shape = box, fontname = Helvetica];
+ "/gnu/store/af19ma2vm3qhvh3rw6cdivyp98s18bj3-guile-bootstrap-2.0.drv" [label = "guile-bootstrap-2.0", shape = box, fontname = "dejavu sans"];
+ "/gnu/store/5syba2bxhh8z79jhq83fzy8fxcx5xb4s-linux-libre-headers-4.4.18.drv" [label = "linux-libre-headers-4.4.18", shape = box, fontname = "dejavu sans"];
"/gnu/store/5syba2bxhh8z79jhq83fzy8fxcx5xb4s-linux-libre-headers-4.4.18.drv" -> "/gnu/store/ccj3as3258l70lmphi48hs7n017wv75s-perl-boot0-5.24.0.drv" [color = blue];
"/gnu/store/5syba2bxhh8z79jhq83fzy8fxcx5xb4s-linux-libre-headers-4.4.18.drv" -> "/gnu/store/1jpld53g41rzv2bmjp6v9mckmyw75vs3-make-boot0-4.2.1.drv" [color = blue];
"/gnu/store/5syba2bxhh8z79jhq83fzy8fxcx5xb4s-linux-libre-headers-4.4.18.drv" -> "/gnu/store/zpphawi07xidhfs2dja3w7hmnfp99j02-diffutils-boot0-3.5.drv" [color = blue];
diff --git a/doc/images/coreutils-bag-graph.dot b/doc/images/coreutils-bag-graph.dot
index 7c90db65d4..4b5d20c8f4 100644
--- a/doc/images/coreutils-bag-graph.dot
+++ b/doc/images/coreutils-bag-graph.dot
@@ -1,5 +1,5 @@
digraph "Guix bag-emerged" {
- "/gnu/store/yv2r96w2dvbb0sjrf9f2imybpnyd616b-coreutils-8.25.drv" [label = "coreutils-8.25", shape = box, fontname = Helvetica];
+ "/gnu/store/yv2r96w2dvbb0sjrf9f2imybpnyd616b-coreutils-8.25.drv" [label = "coreutils-8.25", shape = box, fontname = "dejavu sans"];
"/gnu/store/yv2r96w2dvbb0sjrf9f2imybpnyd616b-coreutils-8.25.drv" -> "/gnu/store/jxcx1jcvzxb17dc69sfwb352vgwyr108-perl-5.24.0.drv" [color = cyan3];
"/gnu/store/yv2r96w2dvbb0sjrf9f2imybpnyd616b-coreutils-8.25.drv" -> "/gnu/store/7ijl8lybdx95kndajavdrpz05jdiwy9g-tar-1.29.drv" [color = cyan3];
"/gnu/store/yv2r96w2dvbb0sjrf9f2imybpnyd616b-coreutils-8.25.drv" -> "/gnu/store/0ykf3p023pzfcg2bw8ahjc7cvmc12zjq-gzip-1.8.drv" [color = cyan3];
@@ -23,7 +23,7 @@ digraph "Guix bag-emerged" {
"/gnu/store/yv2r96w2dvbb0sjrf9f2imybpnyd616b-coreutils-8.25.drv" -> "/gnu/store/ywmblv73pqa8lqqz368g46ysz65pnm0v-acl-2.2.52.drv" [color = cyan3];
"/gnu/store/yv2r96w2dvbb0sjrf9f2imybpnyd616b-coreutils-8.25.drv" -> "/gnu/store/7gqg2kmrm1bjgphnd70ps5c11gqml571-gmp-6.1.1.drv" [color = cyan3];
"/gnu/store/yv2r96w2dvbb0sjrf9f2imybpnyd616b-coreutils-8.25.drv" -> "/gnu/store/ijv3y5l1fbbzwb77lc867r1qbsf147i8-libcap-2.24.drv" [color = cyan3];
- "/gnu/store/jxcx1jcvzxb17dc69sfwb352vgwyr108-perl-5.24.0.drv" [label = "perl-5.24.0", shape = box, fontname = Helvetica];
+ "/gnu/store/jxcx1jcvzxb17dc69sfwb352vgwyr108-perl-5.24.0.drv" [label = "perl-5.24.0", shape = box, fontname = "dejavu sans"];
"/gnu/store/jxcx1jcvzxb17dc69sfwb352vgwyr108-perl-5.24.0.drv" -> "/gnu/store/7ijl8lybdx95kndajavdrpz05jdiwy9g-tar-1.29.drv" [color = blue];
"/gnu/store/jxcx1jcvzxb17dc69sfwb352vgwyr108-perl-5.24.0.drv" -> "/gnu/store/0ykf3p023pzfcg2bw8ahjc7cvmc12zjq-gzip-1.8.drv" [color = blue];
"/gnu/store/jxcx1jcvzxb17dc69sfwb352vgwyr108-perl-5.24.0.drv" -> "/gnu/store/xx3hiqhqn0d94zz7b46hgggwsz3wjiiw-bzip2-1.0.6.drv" [color = blue];
@@ -43,26 +43,26 @@ digraph "Guix bag-emerged" {
"/gnu/store/jxcx1jcvzxb17dc69sfwb352vgwyr108-perl-5.24.0.drv" -> "/gnu/store/hv3dl3my12mq0gkwvckmnqccnckn39l0-gcc-4.9.4.drv" [color = blue];
"/gnu/store/jxcx1jcvzxb17dc69sfwb352vgwyr108-perl-5.24.0.drv" -> "/gnu/store/qbfynm50snyn31w2c3paiw2n6wvzksg8-glibc-2.24.drv" [color = blue];
"/gnu/store/jxcx1jcvzxb17dc69sfwb352vgwyr108-perl-5.24.0.drv" -> "/gnu/store/ir0lq2x7h64g2z5mlqvnlysjk2bc9xka-glibc-utf8-locales-2.24.drv" [color = blue];
- "/gnu/store/7ijl8lybdx95kndajavdrpz05jdiwy9g-tar-1.29.drv" [label = "tar-1.29", shape = box, fontname = Helvetica];
- "/gnu/store/0ykf3p023pzfcg2bw8ahjc7cvmc12zjq-gzip-1.8.drv" [label = "gzip-1.8", shape = box, fontname = Helvetica];
- "/gnu/store/xx3hiqhqn0d94zz7b46hgggwsz3wjiiw-bzip2-1.0.6.drv" [label = "bzip2-1.0.6", shape = box, fontname = Helvetica];
- "/gnu/store/kz8rzasivw4aflsv4rll3m539xybf226-xz-5.2.2.drv" [label = "xz-5.2.2", shape = box, fontname = Helvetica];
- "/gnu/store/3pwrlsd23k2h104akxfj3cxhqcp973g9-file-5.28.drv" [label = "file-5.28", shape = box, fontname = Helvetica];
- "/gnu/store/f1ww5vh5abnvr8b24llipm5dl89s5lq2-diffutils-3.5.drv" [label = "diffutils-3.5", shape = box, fontname = Helvetica];
- "/gnu/store/0cbgdhhyh7hsgwq1x54n9vnq99rfjch9-patch-2.7.5.drv" [label = "patch-2.7.5", shape = box, fontname = Helvetica];
- "/gnu/store/8xjnm44dfwwxp90hxq6zhb6qvia7rb3l-sed-4.2.2.drv" [label = "sed-4.2.2", shape = box, fontname = Helvetica];
- "/gnu/store/54wjl6dp6rp47r67f4nyfqyv8nh456yc-findutils-4.6.0.drv" [label = "findutils-4.6.0", shape = box, fontname = Helvetica];
- "/gnu/store/k951w49yw74ikg19l4mmlwfrq9w7a7zd-gawk-4.1.4.drv" [label = "gawk-4.1.4", shape = box, fontname = Helvetica];
- "/gnu/store/n48xdjkvhlhj5mgdzy59n0dpb9vn0v78-grep-2.25.drv" [label = "grep-2.25", shape = box, fontname = Helvetica];
- "/gnu/store/i52csyja3036ns0zj6z85lkgz3wfyym7-coreutils-8.25.drv" [label = "coreutils-8.25", shape = box, fontname = Helvetica];
- "/gnu/store/nv4mnbz3mpd4gv80djk7762wyvxpccqk-make-4.2.1.drv" [label = "make-4.2.1", shape = box, fontname = Helvetica];
- "/gnu/store/2c60vlcvpj5dvmgklajkp7cpynhcqixr-bash-4.4.0.drv" [label = "bash-4.4.0", shape = box, fontname = Helvetica];
- "/gnu/store/zhc5c4s0xvzizpgpq2za6x84vxv57iy6-ld-wrapper-0.drv" [label = "ld-wrapper-0", shape = box, fontname = Helvetica];
- "/gnu/store/9k1js0kalh4s6q4hf0rgg2n0zdyrwi69-binutils-2.27.drv" [label = "binutils-2.27", shape = box, fontname = Helvetica];
- "/gnu/store/hv3dl3my12mq0gkwvckmnqccnckn39l0-gcc-4.9.4.drv" [label = "gcc-4.9.4", shape = box, fontname = Helvetica];
- "/gnu/store/qbfynm50snyn31w2c3paiw2n6wvzksg8-glibc-2.24.drv" [label = "glibc-2.24", shape = box, fontname = Helvetica];
- "/gnu/store/ir0lq2x7h64g2z5mlqvnlysjk2bc9xka-glibc-utf8-locales-2.24.drv" [label = "glibc-utf8-locales-2.24", shape = box, fontname = Helvetica];
- "/gnu/store/ywmblv73pqa8lqqz368g46ysz65pnm0v-acl-2.2.52.drv" [label = "acl-2.2.52", shape = box, fontname = Helvetica];
+ "/gnu/store/7ijl8lybdx95kndajavdrpz05jdiwy9g-tar-1.29.drv" [label = "tar-1.29", shape = box, fontname = "dejavu sans"];
+ "/gnu/store/0ykf3p023pzfcg2bw8ahjc7cvmc12zjq-gzip-1.8.drv" [label = "gzip-1.8", shape = box, fontname = "dejavu sans"];
+ "/gnu/store/xx3hiqhqn0d94zz7b46hgggwsz3wjiiw-bzip2-1.0.6.drv" [label = "bzip2-1.0.6", shape = box, fontname = "dejavu sans"];
+ "/gnu/store/kz8rzasivw4aflsv4rll3m539xybf226-xz-5.2.2.drv" [label = "xz-5.2.2", shape = box, fontname = "dejavu sans"];
+ "/gnu/store/3pwrlsd23k2h104akxfj3cxhqcp973g9-file-5.28.drv" [label = "file-5.28", shape = box, fontname = "dejavu sans"];
+ "/gnu/store/f1ww5vh5abnvr8b24llipm5dl89s5lq2-diffutils-3.5.drv" [label = "diffutils-3.5", shape = box, fontname = "dejavu sans"];
+ "/gnu/store/0cbgdhhyh7hsgwq1x54n9vnq99rfjch9-patch-2.7.5.drv" [label = "patch-2.7.5", shape = box, fontname = "dejavu sans"];
+ "/gnu/store/8xjnm44dfwwxp90hxq6zhb6qvia7rb3l-sed-4.2.2.drv" [label = "sed-4.2.2", shape = box, fontname = "dejavu sans"];
+ "/gnu/store/54wjl6dp6rp47r67f4nyfqyv8nh456yc-findutils-4.6.0.drv" [label = "findutils-4.6.0", shape = box, fontname = "dejavu sans"];
+ "/gnu/store/k951w49yw74ikg19l4mmlwfrq9w7a7zd-gawk-4.1.4.drv" [label = "gawk-4.1.4", shape = box, fontname = "dejavu sans"];
+ "/gnu/store/n48xdjkvhlhj5mgdzy59n0dpb9vn0v78-grep-2.25.drv" [label = "grep-2.25", shape = box, fontname = "dejavu sans"];
+ "/gnu/store/i52csyja3036ns0zj6z85lkgz3wfyym7-coreutils-8.25.drv" [label = "coreutils-8.25", shape = box, fontname = "dejavu sans"];
+ "/gnu/store/nv4mnbz3mpd4gv80djk7762wyvxpccqk-make-4.2.1.drv" [label = "make-4.2.1", shape = box, fontname = "dejavu sans"];
+ "/gnu/store/2c60vlcvpj5dvmgklajkp7cpynhcqixr-bash-4.4.0.drv" [label = "bash-4.4.0", shape = box, fontname = "dejavu sans"];
+ "/gnu/store/zhc5c4s0xvzizpgpq2za6x84vxv57iy6-ld-wrapper-0.drv" [label = "ld-wrapper-0", shape = box, fontname = "dejavu sans"];
+ "/gnu/store/9k1js0kalh4s6q4hf0rgg2n0zdyrwi69-binutils-2.27.drv" [label = "binutils-2.27", shape = box, fontname = "dejavu sans"];
+ "/gnu/store/hv3dl3my12mq0gkwvckmnqccnckn39l0-gcc-4.9.4.drv" [label = "gcc-4.9.4", shape = box, fontname = "dejavu sans"];
+ "/gnu/store/qbfynm50snyn31w2c3paiw2n6wvzksg8-glibc-2.24.drv" [label = "glibc-2.24", shape = box, fontname = "dejavu sans"];
+ "/gnu/store/ir0lq2x7h64g2z5mlqvnlysjk2bc9xka-glibc-utf8-locales-2.24.drv" [label = "glibc-utf8-locales-2.24", shape = box, fontname = "dejavu sans"];
+ "/gnu/store/ywmblv73pqa8lqqz368g46ysz65pnm0v-acl-2.2.52.drv" [label = "acl-2.2.52", shape = box, fontname = "dejavu sans"];
"/gnu/store/ywmblv73pqa8lqqz368g46ysz65pnm0v-acl-2.2.52.drv" -> "/gnu/store/nw68wjvbw505klgpsavq7dk195wg8ffj-gettext-minimal-0.19.8.1.drv" [color = darkgoldenrod];
"/gnu/store/ywmblv73pqa8lqqz368g46ysz65pnm0v-acl-2.2.52.drv" -> "/gnu/store/jxcx1jcvzxb17dc69sfwb352vgwyr108-perl-5.24.0.drv" [color = darkgoldenrod];
"/gnu/store/ywmblv73pqa8lqqz368g46ysz65pnm0v-acl-2.2.52.drv" -> "/gnu/store/7ijl8lybdx95kndajavdrpz05jdiwy9g-tar-1.29.drv" [color = darkgoldenrod];
@@ -85,7 +85,7 @@ digraph "Guix bag-emerged" {
"/gnu/store/ywmblv73pqa8lqqz368g46ysz65pnm0v-acl-2.2.52.drv" -> "/gnu/store/qbfynm50snyn31w2c3paiw2n6wvzksg8-glibc-2.24.drv" [color = darkgoldenrod];
"/gnu/store/ywmblv73pqa8lqqz368g46ysz65pnm0v-acl-2.2.52.drv" -> "/gnu/store/ir0lq2x7h64g2z5mlqvnlysjk2bc9xka-glibc-utf8-locales-2.24.drv" [color = darkgoldenrod];
"/gnu/store/ywmblv73pqa8lqqz368g46ysz65pnm0v-acl-2.2.52.drv" -> "/gnu/store/gplx9i7c01f2r6qvm6d5w60iam73zmin-attr-2.4.47.drv" [color = darkgoldenrod];
- "/gnu/store/nw68wjvbw505klgpsavq7dk195wg8ffj-gettext-minimal-0.19.8.1.drv" [label = "gettext-minimal-0.19.8.1", shape = box, fontname = Helvetica];
+ "/gnu/store/nw68wjvbw505klgpsavq7dk195wg8ffj-gettext-minimal-0.19.8.1.drv" [label = "gettext-minimal-0.19.8.1", shape = box, fontname = "dejavu sans"];
"/gnu/store/nw68wjvbw505klgpsavq7dk195wg8ffj-gettext-minimal-0.19.8.1.drv" -> "/gnu/store/7ijl8lybdx95kndajavdrpz05jdiwy9g-tar-1.29.drv" [color = dimgrey];
"/gnu/store/nw68wjvbw505klgpsavq7dk195wg8ffj-gettext-minimal-0.19.8.1.drv" -> "/gnu/store/0ykf3p023pzfcg2bw8ahjc7cvmc12zjq-gzip-1.8.drv" [color = dimgrey];
"/gnu/store/nw68wjvbw505klgpsavq7dk195wg8ffj-gettext-minimal-0.19.8.1.drv" -> "/gnu/store/xx3hiqhqn0d94zz7b46hgggwsz3wjiiw-bzip2-1.0.6.drv" [color = dimgrey];
@@ -106,7 +106,7 @@ digraph "Guix bag-emerged" {
"/gnu/store/nw68wjvbw505klgpsavq7dk195wg8ffj-gettext-minimal-0.19.8.1.drv" -> "/gnu/store/qbfynm50snyn31w2c3paiw2n6wvzksg8-glibc-2.24.drv" [color = dimgrey];
"/gnu/store/nw68wjvbw505klgpsavq7dk195wg8ffj-gettext-minimal-0.19.8.1.drv" -> "/gnu/store/ir0lq2x7h64g2z5mlqvnlysjk2bc9xka-glibc-utf8-locales-2.24.drv" [color = dimgrey];
"/gnu/store/nw68wjvbw505klgpsavq7dk195wg8ffj-gettext-minimal-0.19.8.1.drv" -> "/gnu/store/4dql1pzyivg87jwyfmmkwc6jll1vnizc-expat-2.2.0.drv" [color = dimgrey];
- "/gnu/store/4dql1pzyivg87jwyfmmkwc6jll1vnizc-expat-2.2.0.drv" [label = "expat-2.2.0", shape = box, fontname = Helvetica];
+ "/gnu/store/4dql1pzyivg87jwyfmmkwc6jll1vnizc-expat-2.2.0.drv" [label = "expat-2.2.0", shape = box, fontname = "dejavu sans"];
"/gnu/store/4dql1pzyivg87jwyfmmkwc6jll1vnizc-expat-2.2.0.drv" -> "/gnu/store/7ijl8lybdx95kndajavdrpz05jdiwy9g-tar-1.29.drv" [color = darkviolet];
"/gnu/store/4dql1pzyivg87jwyfmmkwc6jll1vnizc-expat-2.2.0.drv" -> "/gnu/store/0ykf3p023pzfcg2bw8ahjc7cvmc12zjq-gzip-1.8.drv" [color = darkviolet];
"/gnu/store/4dql1pzyivg87jwyfmmkwc6jll1vnizc-expat-2.2.0.drv" -> "/gnu/store/xx3hiqhqn0d94zz7b46hgggwsz3wjiiw-bzip2-1.0.6.drv" [color = darkviolet];
@@ -126,7 +126,7 @@ digraph "Guix bag-emerged" {
"/gnu/store/4dql1pzyivg87jwyfmmkwc6jll1vnizc-expat-2.2.0.drv" -> "/gnu/store/hv3dl3my12mq0gkwvckmnqccnckn39l0-gcc-4.9.4.drv" [color = darkviolet];
"/gnu/store/4dql1pzyivg87jwyfmmkwc6jll1vnizc-expat-2.2.0.drv" -> "/gnu/store/qbfynm50snyn31w2c3paiw2n6wvzksg8-glibc-2.24.drv" [color = darkviolet];
"/gnu/store/4dql1pzyivg87jwyfmmkwc6jll1vnizc-expat-2.2.0.drv" -> "/gnu/store/ir0lq2x7h64g2z5mlqvnlysjk2bc9xka-glibc-utf8-locales-2.24.drv" [color = darkviolet];
- "/gnu/store/gplx9i7c01f2r6qvm6d5w60iam73zmin-attr-2.4.47.drv" [label = "attr-2.4.47", shape = box, fontname = Helvetica];
+ "/gnu/store/gplx9i7c01f2r6qvm6d5w60iam73zmin-attr-2.4.47.drv" [label = "attr-2.4.47", shape = box, fontname = "dejavu sans"];
"/gnu/store/gplx9i7c01f2r6qvm6d5w60iam73zmin-attr-2.4.47.drv" -> "/gnu/store/nw68wjvbw505klgpsavq7dk195wg8ffj-gettext-minimal-0.19.8.1.drv" [color = peachpuff4];
"/gnu/store/gplx9i7c01f2r6qvm6d5w60iam73zmin-attr-2.4.47.drv" -> "/gnu/store/7ijl8lybdx95kndajavdrpz05jdiwy9g-tar-1.29.drv" [color = peachpuff4];
"/gnu/store/gplx9i7c01f2r6qvm6d5w60iam73zmin-attr-2.4.47.drv" -> "/gnu/store/0ykf3p023pzfcg2bw8ahjc7cvmc12zjq-gzip-1.8.drv" [color = peachpuff4];
@@ -148,7 +148,7 @@ digraph "Guix bag-emerged" {
"/gnu/store/gplx9i7c01f2r6qvm6d5w60iam73zmin-attr-2.4.47.drv" -> "/gnu/store/qbfynm50snyn31w2c3paiw2n6wvzksg8-glibc-2.24.drv" [color = peachpuff4];
"/gnu/store/gplx9i7c01f2r6qvm6d5w60iam73zmin-attr-2.4.47.drv" -> "/gnu/store/ir0lq2x7h64g2z5mlqvnlysjk2bc9xka-glibc-utf8-locales-2.24.drv" [color = peachpuff4];
"/gnu/store/gplx9i7c01f2r6qvm6d5w60iam73zmin-attr-2.4.47.drv" -> "/gnu/store/jxcx1jcvzxb17dc69sfwb352vgwyr108-perl-5.24.0.drv" [color = peachpuff4];
- "/gnu/store/7gqg2kmrm1bjgphnd70ps5c11gqml571-gmp-6.1.1.drv" [label = "gmp-6.1.1", shape = box, fontname = Helvetica];
+ "/gnu/store/7gqg2kmrm1bjgphnd70ps5c11gqml571-gmp-6.1.1.drv" [label = "gmp-6.1.1", shape = box, fontname = "dejavu sans"];
"/gnu/store/7gqg2kmrm1bjgphnd70ps5c11gqml571-gmp-6.1.1.drv" -> "/gnu/store/d1n7i55s1zcwzi21pnsxhamk3b1zf61d-m4-1.4.17.drv" [color = darkgoldenrod];
"/gnu/store/7gqg2kmrm1bjgphnd70ps5c11gqml571-gmp-6.1.1.drv" -> "/gnu/store/7ijl8lybdx95kndajavdrpz05jdiwy9g-tar-1.29.drv" [color = darkgoldenrod];
"/gnu/store/7gqg2kmrm1bjgphnd70ps5c11gqml571-gmp-6.1.1.drv" -> "/gnu/store/0ykf3p023pzfcg2bw8ahjc7cvmc12zjq-gzip-1.8.drv" [color = darkgoldenrod];
@@ -169,7 +169,7 @@ digraph "Guix bag-emerged" {
"/gnu/store/7gqg2kmrm1bjgphnd70ps5c11gqml571-gmp-6.1.1.drv" -> "/gnu/store/hv3dl3my12mq0gkwvckmnqccnckn39l0-gcc-4.9.4.drv" [color = darkgoldenrod];
"/gnu/store/7gqg2kmrm1bjgphnd70ps5c11gqml571-gmp-6.1.1.drv" -> "/gnu/store/qbfynm50snyn31w2c3paiw2n6wvzksg8-glibc-2.24.drv" [color = darkgoldenrod];
"/gnu/store/7gqg2kmrm1bjgphnd70ps5c11gqml571-gmp-6.1.1.drv" -> "/gnu/store/ir0lq2x7h64g2z5mlqvnlysjk2bc9xka-glibc-utf8-locales-2.24.drv" [color = darkgoldenrod];
- "/gnu/store/d1n7i55s1zcwzi21pnsxhamk3b1zf61d-m4-1.4.17.drv" [label = "m4-1.4.17", shape = box, fontname = Helvetica];
+ "/gnu/store/d1n7i55s1zcwzi21pnsxhamk3b1zf61d-m4-1.4.17.drv" [label = "m4-1.4.17", shape = box, fontname = "dejavu sans"];
"/gnu/store/d1n7i55s1zcwzi21pnsxhamk3b1zf61d-m4-1.4.17.drv" -> "/gnu/store/7ijl8lybdx95kndajavdrpz05jdiwy9g-tar-1.29.drv" [color = cyan3];
"/gnu/store/d1n7i55s1zcwzi21pnsxhamk3b1zf61d-m4-1.4.17.drv" -> "/gnu/store/0ykf3p023pzfcg2bw8ahjc7cvmc12zjq-gzip-1.8.drv" [color = cyan3];
"/gnu/store/d1n7i55s1zcwzi21pnsxhamk3b1zf61d-m4-1.4.17.drv" -> "/gnu/store/xx3hiqhqn0d94zz7b46hgggwsz3wjiiw-bzip2-1.0.6.drv" [color = cyan3];
@@ -189,7 +189,7 @@ digraph "Guix bag-emerged" {
"/gnu/store/d1n7i55s1zcwzi21pnsxhamk3b1zf61d-m4-1.4.17.drv" -> "/gnu/store/hv3dl3my12mq0gkwvckmnqccnckn39l0-gcc-4.9.4.drv" [color = cyan3];
"/gnu/store/d1n7i55s1zcwzi21pnsxhamk3b1zf61d-m4-1.4.17.drv" -> "/gnu/store/qbfynm50snyn31w2c3paiw2n6wvzksg8-glibc-2.24.drv" [color = cyan3];
"/gnu/store/d1n7i55s1zcwzi21pnsxhamk3b1zf61d-m4-1.4.17.drv" -> "/gnu/store/ir0lq2x7h64g2z5mlqvnlysjk2bc9xka-glibc-utf8-locales-2.24.drv" [color = cyan3];
- "/gnu/store/ijv3y5l1fbbzwb77lc867r1qbsf147i8-libcap-2.24.drv" [label = "libcap-2.24", shape = box, fontname = Helvetica];
+ "/gnu/store/ijv3y5l1fbbzwb77lc867r1qbsf147i8-libcap-2.24.drv" [label = "libcap-2.24", shape = box, fontname = "dejavu sans"];
"/gnu/store/ijv3y5l1fbbzwb77lc867r1qbsf147i8-libcap-2.24.drv" -> "/gnu/store/jxcx1jcvzxb17dc69sfwb352vgwyr108-perl-5.24.0.drv" [color = blue];
"/gnu/store/ijv3y5l1fbbzwb77lc867r1qbsf147i8-libcap-2.24.drv" -> "/gnu/store/7ijl8lybdx95kndajavdrpz05jdiwy9g-tar-1.29.drv" [color = blue];
"/gnu/store/ijv3y5l1fbbzwb77lc867r1qbsf147i8-libcap-2.24.drv" -> "/gnu/store/0ykf3p023pzfcg2bw8ahjc7cvmc12zjq-gzip-1.8.drv" [color = blue];
diff --git a/doc/images/coreutils-graph.dot b/doc/images/coreutils-graph.dot
index 920e5f2358..ffb62c922d 100644
--- a/doc/images/coreutils-graph.dot
+++ b/doc/images/coreutils-graph.dot
@@ -1,24 +1,24 @@
digraph "Guix package" {
- "72851008" [label = "coreutils-8.25", shape = box, fontname = Helvetica];
+ "72851008" [label = "coreutils-8.25", shape = box, fontname = "dejavu sans"];
"72851008" -> "49728512" [color = darkseagreen];
"72851008" -> "74872512" [color = darkseagreen];
"72851008" -> "53180864" [color = darkseagreen];
"72851008" -> "75199232" [color = darkseagreen];
- "49728512" [label = "perl-5.24.0", shape = box, fontname = Helvetica];
- "74872512" [label = "acl-2.2.52", shape = box, fontname = Helvetica];
+ "49728512" [label = "perl-5.24.0", shape = box, fontname = "dejavu sans"];
+ "74872512" [label = "acl-2.2.52", shape = box, fontname = "dejavu sans"];
"74872512" -> "74873280" [color = red];
"74872512" -> "49728512" [color = red];
"74872512" -> "74872704" [color = red];
- "74873280" [label = "gettext-minimal-0.19.8.1", shape = box, fontname = Helvetica];
+ "74873280" [label = "gettext-minimal-0.19.8.1", shape = box, fontname = "dejavu sans"];
"74873280" -> "41550784" [color = cyan3];
- "41550784" [label = "expat-2.2.0", shape = box, fontname = Helvetica];
- "74872704" [label = "attr-2.4.47", shape = box, fontname = Helvetica];
+ "41550784" [label = "expat-2.2.0", shape = box, fontname = "dejavu sans"];
+ "74872704" [label = "attr-2.4.47", shape = box, fontname = "dejavu sans"];
"74872704" -> "74873280" [color = cyan3];
"74872704" -> "49728512" [color = cyan3];
- "53180864" [label = "gmp-6.1.1", shape = box, fontname = Helvetica];
+ "53180864" [label = "gmp-6.1.1", shape = box, fontname = "dejavu sans"];
"53180864" -> "50262784" [color = darkgoldenrod];
- "50262784" [label = "m4-1.4.17", shape = box, fontname = Helvetica];
- "75199232" [label = "libcap-2.24", shape = box, fontname = Helvetica];
+ "50262784" [label = "m4-1.4.17", shape = box, fontname = "dejavu sans"];
+ "75199232" [label = "libcap-2.24", shape = box, fontname = "dejavu sans"];
"75199232" -> "49728512" [color = blue];
"75199232" -> "74872704" [color = blue];
diff --git a/doc/images/gcc-core-mesboot0-graph.dot b/doc/images/gcc-core-mesboot0-graph.dot
index ef4e3a441e..de20dbe223 100644
--- a/doc/images/gcc-core-mesboot0-graph.dot
+++ b/doc/images/gcc-core-mesboot0-graph.dot
@@ -1,5 +1,5 @@
digraph "Guix package" {
- "139803511371136" [label = "gcc-core-mesboot0@HIDDEN", shape = box, fontname = sans];
+ "139803511371136" [label = "gcc-core-mesboot0@HIDDEN", shape = box, fontname = "dejavu sans"];
"139803511371136" -> "139803511371312" [color = red];
"139803511371136" -> "139803511372016" [color = red];
"139803511371136" -> "139803511371488" [color = red];
@@ -9,7 +9,7 @@ digraph "Guix package" {
"139803511371136" -> "139803511373600" [color = red];
"139803511371136" -> "139803507105968" [color = red];
"139803511371136" -> "139803749199472" [color = red];
- "139803511371312" [label = "binutils-mesboot0@HIDDEN", shape = box, fontname = sans];
+ "139803511371312" [label = "binutils-mesboot0@HIDDEN", shape = box, fontname = "dejavu sans"];
"139803511371312" -> "139803511372016" [color = dimgrey];
"139803511371312" -> "139803511371488" [color = dimgrey];
"139803511371312" -> "139803511371664" [color = dimgrey];
@@ -18,57 +18,57 @@ digraph "Guix package" {
"139803511371312" -> "139803511373600" [color = dimgrey];
"139803511371312" -> "139803507105968" [color = dimgrey];
"139803511371312" -> "139803749199472" [color = dimgrey];
- "139803511372016" [label = "gzip-mesboot@HIDDEN", shape = box, fontname = sans];
+ "139803511372016" [label = "gzip-mesboot@HIDDEN", shape = box, fontname = "dejavu sans"];
"139803511372016" -> "139803511372192" [color = magenta];
"139803511372016" -> "139803507105792" [color = magenta];
"139803511372016" -> "139803511373600" [color = magenta];
"139803511372016" -> "139803507105968" [color = magenta];
"139803511372016" -> "139803749199472" [color = magenta];
- "139803511372192" [label = "tcc-boot0@HIDDEN", shape = box, fontname = sans];
+ "139803511372192" [label = "tcc-boot0@HIDDEN", shape = box, fontname = "dejavu sans"];
"139803511372192" -> "139803511372368" [color = magenta];
"139803511372192" -> "139803511372544" [color = magenta];
"139803511372192" -> "139803507105792" [color = magenta];
"139803511372192" -> "139803511373600" [color = magenta];
"139803511372192" -> "139803507105968" [color = magenta];
"139803511372192" -> "139803749199472" [color = magenta];
- "139803511372368" [label = "mes-boot@HIDDEN", shape = box, fontname = sans];
+ "139803511372368" [label = "mes-boot@HIDDEN", shape = box, fontname = "dejavu sans"];
"139803511372368" -> "139803511372544" [color = darkviolet];
"139803511372368" -> "139803507105792" [color = darkviolet];
"139803511372368" -> "139803511373600" [color = darkviolet];
"139803511372368" -> "139803507105968" [color = darkviolet];
"139803511372368" -> "139803749199472" [color = darkviolet];
- "139803511372544" [label = "stage0-posix@HIDDEN", shape = box, fontname = sans];
+ "139803511372544" [label = "stage0-posix@HIDDEN", shape = box, fontname = "dejavu sans"];
"139803511372544" -> "139803511373072" [color = peachpuff4];
"139803511372544" -> "139803507105792" [color = peachpuff4];
"139803511372544" -> "139803511373600" [color = peachpuff4];
"139803511372544" -> "139803507105968" [color = peachpuff4];
"139803511372544" -> "139803749199472" [color = peachpuff4];
- "139803511373072" [label = "bootstrap-seeds@HIDDEN", shape = ellipse, fontname = sans];
+ "139803511373072" [label = "bootstrap-seeds@HIDDEN", shape = ellipse, fontname = "dejavu sans"];
"139803511373072" -> "139803507105968" [color = cyan3];
- "139803507105968" [label = "bootar@1b", shape = box, fontname = sans];
+ "139803507105968" [label = "bootar@1b", shape = box, fontname = "dejavu sans"];
"139803507105968" -> "139803749199472" [color = dimgrey];
- "139803749199472" [label = "guile-bootstrap@HIDDEN", shape = ellipse, fontname = sans];
- "139803507105792" [label = "gash-boot@HIDDEN", shape = box, fontname = sans];
+ "139803749199472" [label = "guile-bootstrap@HIDDEN", shape = ellipse, fontname = "dejavu sans"];
+ "139803507105792" [label = "gash-boot@HIDDEN", shape = box, fontname = "dejavu sans"];
"139803507105792" -> "139803507105968" [color = darkviolet];
"139803507105792" -> "139803749199472" [color = darkviolet];
- "139803511373600" [label = "gash-utils-boot@HIDDEN", shape = box, fontname = sans];
+ "139803511373600" [label = "gash-utils-boot@HIDDEN", shape = box, fontname = "dejavu sans"];
"139803511373600" -> "139803507105968" [color = red];
"139803511373600" -> "139803507105792" [color = red];
"139803511373600" -> "139803749199472" [color = red];
- "139803511371488" [label = "patch-mesboot@HIDDEN", shape = box, fontname = sans];
+ "139803511371488" [label = "patch-mesboot@HIDDEN", shape = box, fontname = "dejavu sans"];
"139803511371488" -> "139803511371840" [color = darkseagreen];
"139803511371488" -> "139803511372192" [color = darkseagreen];
"139803511371488" -> "139803507105792" [color = darkseagreen];
"139803511371488" -> "139803511373600" [color = darkseagreen];
"139803511371488" -> "139803507105968" [color = darkseagreen];
"139803511371488" -> "139803749199472" [color = darkseagreen];
- "139803511371840" [label = "make-mesboot0@HIDDEN", shape = box, fontname = sans];
+ "139803511371840" [label = "make-mesboot0@HIDDEN", shape = box, fontname = "dejavu sans"];
"139803511371840" -> "139803511372192" [color = blue];
"139803511371840" -> "139803507105792" [color = blue];
"139803511371840" -> "139803511373600" [color = blue];
"139803511371840" -> "139803507105968" [color = blue];
"139803511371840" -> "139803749199472" [color = blue];
- "139803511371664" [label = "tcc-boot@HIDDEN", shape = box, fontname = sans];
+ "139803511371664" [label = "tcc-boot@HIDDEN", shape = box, fontname = "dejavu sans"];
"139803511371664" -> "139803511371840" [color = peachpuff4];
"139803511371664" -> "139803511372192" [color = peachpuff4];
"139803511371664" -> "139803507105792" [color = peachpuff4];
diff --git a/doc/images/service-graph.dot b/doc/images/service-graph.dot
index b7b617abbc..8de91f1adc 100644
--- a/doc/images/service-graph.dot
+++ b/doc/images/service-graph.dot
@@ -1,12 +1,12 @@
digraph "Service Type Dependencies" {
- shepherd [shape = box, fontname = Helvetica];
- pam [shape = box, fontname = Helvetica];
- etc [shape = box, fontname = Helvetica];
- profile [shape = box, fontname = Helvetica];
- accounts [shape = box, fontname = Helvetica];
- activation [shape = box, fontname = Helvetica];
- boot [shape = box, fontname = Helvetica];
- system [shape = house, fontname = Helvetica];
+ shepherd [shape = box, fontname = "dejavu sans"];
+ pam [shape = box, fontname = "dejavu sans"];
+ etc [shape = box, fontname = "dejavu sans"];
+ profile [shape = box, fontname = "dejavu sans"];
+ accounts [shape = box, fontname = "dejavu sans"];
+ activation [shape = box, fontname = "dejavu sans"];
+ boot [shape = box, fontname = "dejavu sans"];
+ system [shape = house, fontname = "dejavu sans"];
lshd -> shepherd;
lshd -> pam;
udev -> shepherd;
diff --git a/doc/images/shepherd-graph.dot b/doc/images/shepherd-graph.dot
index 35b2794689..06b028701b 100644
--- a/doc/images/shepherd-graph.dot
+++ b/doc/images/shepherd-graph.dot
@@ -1,7 +1,7 @@
digraph "Guix shepherd-service" {
- "user-file-systems" [label = "user-file-systems", shape = box, fontname = Helvetica];
+ "user-file-systems" [label = "user-file-systems", shape = box, fontname = "dejavu sans"];
"user-processes" -> "user-file-systems" [color = cyan3];
- "user-processes" [label = "user-processes", shape = box, fontname = Helvetica];
+ "user-processes" [label = "user-processes", shape = box, fontname = "dejavu sans"];
"nscd" -> "user-processes" [color = magenta];
"guix-daemon" -> "user-processes" [color = blue];
"urandom-seed" -> "user-processes" [color = dimgrey];
@@ -13,45 +13,45 @@ digraph "Guix shepherd-service" {
"term-tty2" -> "user-processes" [color = darkviolet];
"term-tty1" -> "user-processes" [color = peachpuff4];
"networking" -> "user-processes" [color = dimgrey];
- "nscd" [label = "nscd", shape = box, fontname = Helvetica];
- "guix-daemon" [label = "guix-daemon", shape = box, fontname = Helvetica];
- "urandom-seed" [label = "urandom-seed", shape = box, fontname = Helvetica];
- "syslogd" [label = "syslogd", shape = box, fontname = Helvetica];
+ "nscd" [label = "nscd", shape = box, fontname = "dejavu sans"];
+ "guix-daemon" [label = "guix-daemon", shape = box, fontname = "dejavu sans"];
+ "urandom-seed" [label = "urandom-seed", shape = box, fontname = "dejavu sans"];
+ "syslogd" [label = "syslogd", shape = box, fontname = "dejavu sans"];
"ssh-daemon" -> "syslogd" [color = darkgoldenrod];
- "ssh-daemon" [label = "ssh-daemon", shape = box, fontname = Helvetica];
- "term-tty6" [label = "term-tty6", shape = box, fontname = Helvetica];
+ "ssh-daemon" [label = "ssh-daemon", shape = box, fontname = "dejavu sans"];
+ "term-tty6" [label = "term-tty6", shape = box, fontname = "dejavu sans"];
"console-font-tty6" -> "term-tty6" [color = darkgoldenrod];
- "console-font-tty6" [label = "console-font-tty6", shape = box, fontname = Helvetica];
- "term-tty5" [label = "term-tty5", shape = box, fontname = Helvetica];
+ "console-font-tty6" [label = "console-font-tty6", shape = box, fontname = "dejavu sans"];
+ "term-tty5" [label = "term-tty5", shape = box, fontname = "dejavu sans"];
"console-font-tty5" -> "term-tty5" [color = dimgrey];
- "console-font-tty5" [label = "console-font-tty5", shape = box, fontname = Helvetica];
- "term-tty4" [label = "term-tty4", shape = box, fontname = Helvetica];
+ "console-font-tty5" [label = "console-font-tty5", shape = box, fontname = "dejavu sans"];
+ "term-tty4" [label = "term-tty4", shape = box, fontname = "dejavu sans"];
"console-font-tty4" -> "term-tty4" [color = darkviolet];
- "console-font-tty4" [label = "console-font-tty4", shape = box, fontname = Helvetica];
- "term-tty3" [label = "term-tty3", shape = box, fontname = Helvetica];
+ "console-font-tty4" [label = "console-font-tty4", shape = box, fontname = "dejavu sans"];
+ "term-tty3" [label = "term-tty3", shape = box, fontname = "dejavu sans"];
"console-font-tty3" -> "term-tty3" [color = peachpuff4];
- "console-font-tty3" [label = "console-font-tty3", shape = box, fontname = Helvetica];
- "term-tty2" [label = "term-tty2", shape = box, fontname = Helvetica];
+ "console-font-tty3" [label = "console-font-tty3", shape = box, fontname = "dejavu sans"];
+ "term-tty2" [label = "term-tty2", shape = box, fontname = "dejavu sans"];
"console-font-tty2" -> "term-tty2" [color = darkseagreen];
- "console-font-tty2" [label = "console-font-tty2", shape = box, fontname = Helvetica];
- "term-tty1" [label = "term-tty1", shape = box, fontname = Helvetica];
+ "console-font-tty2" [label = "console-font-tty2", shape = box, fontname = "dejavu sans"];
+ "term-tty1" [label = "term-tty1", shape = box, fontname = "dejavu sans"];
"console-font-tty1" -> "term-tty1" [color = cyan3];
- "console-font-tty1" [label = "console-font-tty1", shape = box, fontname = Helvetica];
- "networking" [label = "networking", shape = box, fontname = Helvetica];
+ "console-font-tty1" [label = "console-font-tty1", shape = box, fontname = "dejavu sans"];
+ "networking" [label = "networking", shape = box, fontname = "dejavu sans"];
"ssh-daemon" -> "networking" [color = darkgoldenrod];
- "root-file-system" [label = "root-file-system", shape = box, fontname = Helvetica];
+ "root-file-system" [label = "root-file-system", shape = box, fontname = "dejavu sans"];
"file-system-/dev/pts" -> "root-file-system" [color = peachpuff4];
"file-system-/dev/shm" -> "root-file-system" [color = darkgoldenrod];
"file-system-/gnu/store" -> "root-file-system" [color = blue];
"user-processes" -> "root-file-system" [color = cyan3];
"udev" -> "root-file-system" [color = darkseagreen];
- "file-system-/dev/pts" [label = "file-system-/dev/pts", shape = box, fontname = Helvetica];
+ "file-system-/dev/pts" [label = "file-system-/dev/pts", shape = box, fontname = "dejavu sans"];
"user-processes" -> "file-system-/dev/pts" [color = cyan3];
- "file-system-/dev/shm" [label = "file-system-/dev/shm", shape = box, fontname = Helvetica];
+ "file-system-/dev/shm" [label = "file-system-/dev/shm", shape = box, fontname = "dejavu sans"];
"user-processes" -> "file-system-/dev/shm" [color = cyan3];
- "file-system-/gnu/store" [label = "file-system-/gnu/store", shape = box, fontname = Helvetica];
+ "file-system-/gnu/store" [label = "file-system-/gnu/store", shape = box, fontname = "dejavu sans"];
"user-processes" -> "file-system-/gnu/store" [color = cyan3];
- "udev" [label = "udev", shape = box, fontname = Helvetica];
+ "udev" [label = "udev", shape = box, fontname = "dejavu sans"];
"term-tty6" -> "udev" [color = magenta];
"term-tty5" -> "udev" [color = red];
"term-tty4" -> "udev" [color = darkgoldenrod];
@@ -59,13 +59,13 @@ digraph "Guix shepherd-service" {
"term-tty2" -> "udev" [color = darkviolet];
"term-tty1" -> "udev" [color = peachpuff4];
"networking" -> "udev" [color = dimgrey];
- "host-name" [label = "host-name", shape = box, fontname = Helvetica];
+ "host-name" [label = "host-name", shape = box, fontname = "dejavu sans"];
"term-tty6" -> "host-name" [color = magenta];
"term-tty5" -> "host-name" [color = red];
"term-tty4" -> "host-name" [color = darkgoldenrod];
"term-tty3" -> "host-name" [color = dimgrey];
"term-tty2" -> "host-name" [color = darkviolet];
"term-tty1" -> "host-name" [color = peachpuff4];
- "loopback" [label = "loopback", shape = box, fontname = Helvetica];
+ "loopback" [label = "loopback", shape = box, fontname = "dejavu sans"];
}
--
2.41.0
--=-=-=
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
--=20
Janneke Nieuwenhuizen <janneke@HIDDEN> | GNU LilyPond https://LilyPond.org
Freelance IT https://www.JoyOfSource.com | Avatar=C2=AE https://AvatarAcade=
my.com
--=-=-=--
guix-patches@HIDDEN:bug#70169; Package guix-patches.
Full text available.Received: (at 70169) by debbugs.gnu.org; 6 Apr 2024 21:18:45 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sat Apr 06 17:18:44 2024 Received: from localhost ([127.0.0.1]:41145 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rtDQy-0000Wi-AW for submit <at> debbugs.gnu.org; Sat, 06 Apr 2024 17:18:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58516) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <janneke@HIDDEN>) id 1rtDQp-0000Ta-B2 for 70169 <at> debbugs.gnu.org; Sat, 06 Apr 2024 17:18:36 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <janneke@HIDDEN>) id 1rtDQd-0004Mw-LV; Sat, 06 Apr 2024 17:18:23 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=0LayddsJYEg/1OFPCcqnJJ0ln/UqLcIBQbDqggSMilU=; b=ii5m947EyLKwC5ZdzNpc RuTuZOMj61KotiWisA2hzq4F+M8fO6k7vqhnrpBD5elS/7LQ/9qNCvEW5wNAdwe909bkAvYUQm6EG t7De7w/qs0yzE3qV/wdiqjm8msVR2y2S4bTuBKaSlxLHNONhH5I+j1DExud9PVt+Ci6RTDM7t1uaa QhZ6oG7U7RGK8WeGsHJm71Xntd0AyI84AKEv4tkmvZD9sVEDk4Aj0ETeLjhZ/Txzwh5pSA+Y8j//b splNhluaoyHi4x9lANnX6P8Gh38OOzOxtJddllazD8nL/4PF+5jr0H1KN7xRs27Sc+R0yNpJdmUue 5XNKbrQLH1XLgw==; From: Janneke Nieuwenhuizen <janneke@HIDDEN> To: 70169 <at> debbugs.gnu.org Subject: [PATCH v2 12/12] maint: Ensure generated file reproducibility for dist. Date: Sat, 6 Apr 2024 23:18:04 +0200 Message-ID: <933766d5b3574d509b917b80743b127370a61676.1712437365.git.janneke@HIDDEN> X-Mailer: git-send-email 2.41.0 In-Reply-To: <cover.1712437365.git.janneke@HIDDEN> References: <cover.1712437365.git.janneke@HIDDEN> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 70169 X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -3.3 (---) * doc/local.mk (doc-clean): New target. (DIST_CONFIGURE_FLAGS): New variable. (auto-clean): Use them in new target. * Makefile.am (dist-doc-pot-update): Use it in new target. (dist): Change to depend on it to clean possibly stale files, instead of doc-pot-update directly. Add a toplevel check to ensure that Autotools cache is up to date. Change-Id: I2ff2d88db9fe1e708ab65e33e1f3d7ecee882cb4 --- Makefile.am | 29 ++++++++++++++++++++++++++--- doc/local.mk | 29 +++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 7af88b2988..aac328b75e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -954,9 +954,32 @@ guix-binary.%.tar.xz: cp "$$tarball" "$@.tmp" ; mv "$@.tmp" "$@" -# The dependency on doc-pot-update is to generate the .pot files, which are -# not checked in. -dist: doc-pot-update +# Assert that Autotools cache is up to date with Git, by checking +# PACKAGE_VERSION against HEAD. Indented to get past Automake. + ifeq ($(MAKECMDGOALS),dist) + git_version = $(shell build-aux/git-version-gen .tarball-version) + ifneq ($(PACKAGE_VERSION),$(git_version)) + $(warning Autotools cache out of date.) + $(info Autotools cache version: $(PACKAGE_VERSION).) + $(info Git version: $(git_version).) + $(info Please run `autoreconf -vif'.) #` + ifneq ($(GUIX_ALLOW_IRREPRODUCIBLE_TARBALL),yes) + $(error Cannot create reproducible tarball) + else + $(warning Tarball will be irreproducible; distdir will not get removed!) + endif + endif + endif + +# The dependency on dist-doc-pot-update is to clean possibly stale doc and po +# files and only then generate the .pot files, which are not checked in. +dist: dist-doc-pot-update +dist-doc-pot-update: auto-clean + $(MAKE) guile$(EXEEXT) + $(MAKE) -C po/guix all + $(MAKE) -C po/packages all + $(MAKE) doc-pot-update + $(MAKE) guix-daemon dist-hook: gen-ChangeLog gen-AUTHORS gen-tarball-version dist-hook: assert-no-store-file-names diff --git a/doc/local.mk b/doc/local.mk index 25741a5c88..8ba1ce4668 100644 --- a/doc/local.mk +++ b/doc/local.mk @@ -294,3 +294,32 @@ $(eval $(call version.texi-from-git,vti,doc/guix.texi,)) $(foreach lang, $(MANUAL_LANGUAGES), \ $(eval i=$(shell echo $$(($(i)+1)))) \ $(eval $(call version.texi-from-git,$(i),po/doc/guix-manual.$(lang).po,-$(lang)))) + +DIST_CONFIGURE_FLAGS = \ + --localstatedir=/var \ + --sysconfdir=/etc + +# Delete all Autotools-generated files and rerun configure to ensure +# a clean cache and distributing reproducible versions. +auto-clean: maintainer-clean-vti doc-clean + rm -f ABOUT-NLS INSTALL + rm -f aclocal.m4 configure libtool Makefile.in + git clean -fdx -- '.am*' build-aux m4 po + rm -f guile + rm -f guix-daemon nix/nix-daemon/guix_daemon-guix-daemon.o +# Automake fails if guix-cookbook-LANG.texi stubs are missing; running +# autoreconf -vif is not enough. + ./bootstrap +# The dependency chain for the guix-cookbook-LANG.texi was cut on purpose; +# they must be deleted to ensure a rebuild. + rm -f $(filter-out %D%/guix.texi %D%/guix-cookbook.texi, $(info_TEXINFOS)) + ./configure $(DIST_CONFIGURE_FLAGS) + +# Delete all generated doc files to ensure a clean cache and distributing +# reproducible versions. +doc-clean: + rm -f $(srcdir)/doc/*.1 + rm -f $(srcdir)/doc/stamp* + rm -f $(DOT_FILES:%.dot=%.png) + rm -f $(DOT_VECTOR_GRAPHICS) + rm -f doc/images/coreutils-size-map.eps -- 2.41.0
guix-patches@HIDDEN:bug#70169; Package guix-patches.
Full text available.
Received: (at 70169) by debbugs.gnu.org; 6 Apr 2024 21:18:44 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sat Apr 06 17:18:44 2024
Received: from localhost ([127.0.0.1]:41143 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rtDQx-0000Wb-Vd
for submit <at> debbugs.gnu.org; Sat, 06 Apr 2024 17:18:44 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:58500)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <janneke@HIDDEN>) id 1rtDQo-0000TS-90
for 70169 <at> debbugs.gnu.org; Sat, 06 Apr 2024 17:18:35 -0400
Received: from fencepost.gnu.org ([2001:470:142:3::e])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <janneke@HIDDEN>)
id 1rtDQc-0004Ly-J5; Sat, 06 Apr 2024 17:18:22 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To:
From; bh=/HH2YKVA3F9iQQFPXRMEEBVGJXIMEolAhfHdzC6UCtg=; b=SIm4Nw5TuxeCjt6in3VS
bnfgK4YDNtijDrA2/l2yL98BT/LVHUExJ6ibDEazpI4JjW2me9KvDOy+HQnd1xfg1HKeOBgVBrkn/
NnyJlOqZfHez4+Mx4ds9dM4q8Uh2VuBbTRgMxcr4D87dy4OSobqGpSLIpcLmGCAxxhifop+zvmY6w
SZi9Fq2opJNNrNe03hSnn2xr/kvRCQ9f7JIjdvniaFEhMD+kwt9WNXSS/jD0pxlgczygF/DEUixaV
fJ3C/RGRbh/OmKhoTU2i8BMeGVVsxiaCz6upD0Zawf2AqB37lXCflk7zNM7spBJ/XERLJOD82B+De
WtAU+E4ss3dffw==;
From: Janneke Nieuwenhuizen <janneke@HIDDEN>
To: 70169 <at> debbugs.gnu.org
Subject: [PATCH v2 11/12] maint: Reset CreationDate metadata on generated PDFs.
Date: Sat, 6 Apr 2024 23:18:03 +0200
Message-ID: <7d3e7ef4c6ecfa77a6b6c237165c148578443511.1712437365.git.janneke@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1712437365.git.janneke@HIDDEN>
References: <cover.1712437365.git.janneke@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 70169
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
* doc/local.mk (.dot.pdf): Create PDF in UTC0 and reset CreationDate metadata.
Change-Id: I3873ecdeec781c30874d53d032406cbe23922a25
---
doc/local.mk | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/doc/local.mk b/doc/local.mk
index a0d94614d3..25741a5c88 100644
--- a/doc/local.mk
+++ b/doc/local.mk
@@ -148,7 +148,11 @@ DOT_OPTIONS = \
$(AM_V_at)mv "$(srcdir)/$@.tmp" "$(srcdir)/$@"
.dot.pdf:
- $(AM_V_DOT)$(DOT) -Tpdf $(DOT_OPTIONS) < "$<" > "$(srcdir)/$@.tmp"
+ export TZ=UTC0; \
+ $(AM_V_DOT)$(DOT) -Tpdf $(DOT_OPTIONS) < "$<" > "$(srcdir)/$@.tmp"
+ $(AM_V_at)sed -ri \
+ -e 's,(/CreationDate [(]D:)[0-9+]{14},\119700101000000,' \
+ "$(srcdir)/$@.tmp"
$(AM_V_at)mv "$(srcdir)/$@.tmp" "$(srcdir)/$@"
.dot.eps:
--
2.41.0
guix-patches@HIDDEN:bug#70169; Package guix-patches.
Full text available.Received: (at 70169) by debbugs.gnu.org; 6 Apr 2024 21:18:44 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sat Apr 06 17:18:43 2024 Received: from localhost ([127.0.0.1]:41141 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rtDQx-0000WT-Jz for submit <at> debbugs.gnu.org; Sat, 06 Apr 2024 17:18:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58494) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <janneke@HIDDEN>) id 1rtDQn-0000TJ-8e for 70169 <at> debbugs.gnu.org; Sat, 06 Apr 2024 17:18:35 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <janneke@HIDDEN>) id 1rtDQb-0004KC-IK; Sat, 06 Apr 2024 17:18:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=26ymXivTl3wthxASIxo2xX67t9GDVi7q2hEEP1b4D4o=; b=huywXC3jk05Ws5YdCaxZ /eaf/COCoVdLETUP0Ufv6nG6kJPOHXoKqkbUEl8KkAQ9AGdYaqN6MuJ0VfiKRA2yoek6DJaEwYl8y xnrHwLYch7WoghK4BLB8HR8aV0+qWwyuf00P4svTeELSI1Fk2G0TRL4tMpvJGgYNgi1TkSoc82JEh KfZ3CUEqe6PP4mLshqJik0VHScJJa70TRp+qtVywoF+rv3FGlp9wSwMgwuH3qWoXXT4Zb9IKpbahp mY2sJAqYPnA7TQr9eBYqnPWjhjldbSjq01oEdtxLTiGPwcaeWNs6TJ0eInXRL9OfpSVWInugrJmRo 03c+RoUvm65jsA==; From: Janneke Nieuwenhuizen <janneke@HIDDEN> To: 70169 <at> debbugs.gnu.org Subject: [PATCH v2 10/12] maint: Avoid PNG and PDF generation to fail silently. Date: Sat, 6 Apr 2024 23:18:02 +0200 Message-ID: <ad583386eca8a21b0cc9df040f4a44176660fa24.1712437365.git.janneke@HIDDEN> X-Mailer: git-send-email 2.41.0 In-Reply-To: <cover.1712437365.git.janneke@HIDDEN> References: <cover.1712437365.git.janneke@HIDDEN> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 70169 X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -3.3 (---) * doc/local.mk (.dot.png): Split single shell command into separate recipe lines, prefixed by $(AM_V_at). (.dot.pdf): Likewise. Change-Id: I41fb856bb73f947abd91361ed203132e939f3897 --- doc/local.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/local.mk b/doc/local.mk index 60e36091ce..a0d94614d3 100644 --- a/doc/local.mk +++ b/doc/local.mk @@ -144,12 +144,12 @@ DOT_OPTIONS = \ -Nfontsize=9 -Nheight=.1 -Nwidth=.1 .dot.png: - $(AM_V_DOT)$(DOT) -Tpng $(DOT_OPTIONS) < "$<" > "$(srcdir)/$@.tmp"; \ - mv "$(srcdir)/$@.tmp" "$(srcdir)/$@" + $(AM_V_DOT)$(DOT) -Tpng $(DOT_OPTIONS) < "$<" > "$(srcdir)/$@.tmp" + $(AM_V_at)mv "$(srcdir)/$@.tmp" "$(srcdir)/$@" .dot.pdf: - $(AM_V_DOT)$(DOT) -Tpdf $(DOT_OPTIONS) < "$<" > "$(srcdir)/$@.tmp"; \ - mv "$(srcdir)/$@.tmp" "$(srcdir)/$@" + $(AM_V_DOT)$(DOT) -Tpdf $(DOT_OPTIONS) < "$<" > "$(srcdir)/$@.tmp" + $(AM_V_at)mv "$(srcdir)/$@.tmp" "$(srcdir)/$@" .dot.eps: $(AM_V_DOT)$(DOT) -Teps $(DOT_OPTIONS) < "$<" > "$(srcdir)/$@.tmp" -- 2.41.0
guix-patches@HIDDEN:bug#70169; Package guix-patches.
Full text available.Received: (at 70169) by debbugs.gnu.org; 6 Apr 2024 21:18:43 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sat Apr 06 17:18:43 2024 Received: from localhost ([127.0.0.1]:41139 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rtDQx-0000WK-76 for submit <at> debbugs.gnu.org; Sat, 06 Apr 2024 17:18:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58490) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <janneke@HIDDEN>) id 1rtDQm-0000TC-6b for 70169 <at> debbugs.gnu.org; Sat, 06 Apr 2024 17:18:34 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <janneke@HIDDEN>) id 1rtDQa-0004JC-GA; Sat, 06 Apr 2024 17:18:20 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=42twIY8a4hIeSmKZ5QgsYFKpQnpkkZKIRC/7yIBrwc8=; b=GAQ3jS4HrMyhDW3+Flv1 O/DTm6zcKmOWYZHLcY6JRGc/YIKdPagGb6+IkgXDoeEyCRIclqinOHQN/Npk3HvbLujZEoOvJyrFk /QwW0gguJ4MR04jBF0CIsW7a0WigVFNtmK4mG3XjijNUa7Y/481HVBqvJGorMRpCyi4ogz8E0qXRc dvq04DetadI2KeAlUZ4hyLmrLvge48wNFzf6wjYVw1KvCLA06VC7lYi2dGj+QG+XPeCPG+Ys6FV6W M7mpkchQ59aXhhXSk5x6CKpuCsiSnagb/1Cvz/q2XsqiqgBDIc0sAIPhFy61VZTI23QBFR1fWUQ41 +RaThAB6cuSMlg==; From: Janneke Nieuwenhuizen <janneke@HIDDEN> To: 70169 <at> debbugs.gnu.org Subject: [PATCH v2 09/12] maint: Remove %%CreationDate from generated EPS files Date: Sat, 6 Apr 2024 23:18:01 +0200 Message-ID: <109c05ead54c3e48a8df27794c8df56149343a37.1712437365.git.janneke@HIDDEN> X-Mailer: git-send-email 2.41.0 In-Reply-To: <cover.1712437365.git.janneke@HIDDEN> References: <cover.1712437365.git.janneke@HIDDEN> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 70169 X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -3.3 (---) * doc/local.mk (.dot.eps, png.eps): Remove %%CreationDate. Split single shell command into separate recipe lines, prefixed by $(AM_V_at). Change-Id: I5a03485c19c72f0c46411815c51290e52a8e5399 --- doc/local.mk | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/doc/local.mk b/doc/local.mk index c355bec8d7..60e36091ce 100644 --- a/doc/local.mk +++ b/doc/local.mk @@ -152,12 +152,16 @@ DOT_OPTIONS = \ mv "$(srcdir)/$@.tmp" "$(srcdir)/$@" .dot.eps: - $(AM_V_DOT)$(DOT) -Teps $(DOT_OPTIONS) < "$<" > "$(srcdir)/$@.tmp"; \ - mv "$(srcdir)/$@.tmp" "$(srcdir)/$@" + $(AM_V_DOT)$(DOT) -Teps $(DOT_OPTIONS) < "$<" > "$(srcdir)/$@.tmp" + $(AM_V_at)grep -v ^%%CreationDate: "$(srcdir)/$@.tmp" > "$(srcdir)/$@.tmp2" + $(AM_V_at)rm -f "$(srcdir)/$@.tmp" + $(AM_V_at)mv "$(srcdir)/$@.tmp2" "$@" .png.eps: - $(AM_V_GEN)convert "$<" "$@-tmp.eps"; \ - mv "$@-tmp.eps" "$@" + $(AM_V_GEN)convert "$<" "$@-tmp.eps" + $(AM_V_at)grep -v ^%%CreationDate: "$@-tmp.eps" > "$@-tmp2.eps" + $(AM_V_at)rm -f "$@-tmp.eps" + $(AM_V_at)mv "$@-tmp2.eps" "$@" # We cannot add new dependencies to `%D%/guix.pdf' & co. (info "(automake) # Extending"). Using the `-local' rules is imperfect, because they may be -- 2.41.0
guix-patches@HIDDEN:bug#70169; Package guix-patches.
Full text available.
Received: (at 70169) by debbugs.gnu.org; 6 Apr 2024 21:18:43 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sat Apr 06 17:18:43 2024
Received: from localhost ([127.0.0.1]:41137 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rtDQw-0000WC-Ot
for submit <at> debbugs.gnu.org; Sat, 06 Apr 2024 17:18:43 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:53914)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <janneke@HIDDEN>) id 1rtDQg-0000SV-Pp
for 70169 <at> debbugs.gnu.org; Sat, 06 Apr 2024 17:18:33 -0400
Received: from fencepost.gnu.org ([2001:470:142:3::e])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <janneke@HIDDEN>)
id 1rtDQV-0004Fd-0k; Sat, 06 Apr 2024 17:18:15 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To:
From; bh=yEh0s9k5wuUas+d9sT5lQNiUMKcB+alt+Mda8GU7uVU=; b=VJDfl5rV9gNvkuoYOVN8
uqEPkPFDcWpJnm5hfWf+z/ecSidLKZWc9Wp996oTWpC5O4ERQ2/NcjPrWT1MziJoA3YVAIPRarAUz
I755E9eO9gNiC3qKuV81Htpyt0Ykhi5FGq9+hu2KAozXA5x6148vXBtYGBl2Ajejpp1Km4om8IlHG
nc7YpmU6k51ZD7QDoEpR+Li3L5m+TwevktSEHnIA5Jh9HP2ZW7Xy0T/nRr9pjlC0KtdPGLzBAAvue
QSZfmvTvofVdFwLSjBbLutcC7L+Cs12a3GcZ5sbfayK+czhNe3RcGmPrSpocJ/IBq8CdTRlba+QWK
pl46Dy+PFP5AFw==;
From: Janneke Nieuwenhuizen <janneke@HIDDEN>
To: 70169 <at> debbugs.gnu.org
Subject: [PATCH v2 03/12] maint: Generate 'doc/version.texi' reproducibly.
Date: Sat, 6 Apr 2024 23:17:55 +0200
Message-ID: <8dd765c01a81bb5105fa32bc71bbb71181664609.1712437365.git.janneke@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1712437365.git.janneke@HIDDEN>
References: <cover.1712437365.git.janneke@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 70169
Cc: Timothy Sample <samplet@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
From: Timothy Sample <samplet@HIDDEN>
* doc/local.mk ($(srcdir)/doc/stamp-vti): New rule (overriding one provided
by Automake).
Co-authored-by: Janneke Nieuwenhuizen <janneke@HIDDEN>
Change-Id: If44965e9a3ecfb45865c58ee7a558951be8d15ae
---
doc/local.mk | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/doc/local.mk b/doc/local.mk
index 8df003b891..5f014b9c3d 100644
--- a/doc/local.mk
+++ b/doc/local.mk
@@ -5,6 +5,7 @@
# Copyright © 2016 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@HIDDEN>
# Copyright © 2016, 2018 Mathieu Lirzin <mthl@HIDDEN>
# Copyright © 2018, 2021 Julien Lepiller <julien@HIDDEN>
+# Copyright © 2019 Timothy Sample <samplet@HIDDEN>
#
# This file is part of GNU Guix.
#
@@ -247,3 +248,22 @@ $(srcdir)/%D%/guix-daemon.1: guix-daemon$(EXEEXT)
endif
endif
+
+# Reproducible tarball
+
+# Generate 'version.texi' reproducibly using metadata from Git rather
+# than using metadata from the filesystem.
+$(srcdir)/doc/stamp-vti: $(srcdir)/doc/guix.texi $(top_srcdir)/configure
+ $(AM_V_GEN)set -e \
+ export LC_ALL=C; \
+ export TZ=UTC0; \
+ timestamp=$$(git log --pretty=format:%ct -n1 -- $< 2>/dev/null \
+ || echo $(SOURCE_DATE_EPOCH)) \
+ dmy=$$(date --date="@$$timestamp" "+%-d %B %Y"); \
+ my=$$(date --date="@$$timestamp" "+%B %Y"); \
+ { echo "@set UPDATED $$dmy"; \
+ echo "@set UPDATED-MONTH $$my"; \
+ echo "@set EDITION $(VERSION)"; \
+ echo "@set VERSION $(VERSION)"; } > $@-t; \
+ mv $@-t $@
+ @cp $@ $(srcdir)/doc/version.texi
--
2.41.0
guix-patches@HIDDEN:bug#70169; Package guix-patches.
Full text available.Received: (at 70169) by debbugs.gnu.org; 6 Apr 2024 21:18:42 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sat Apr 06 17:18:42 2024 Received: from localhost ([127.0.0.1]:41135 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rtDQw-0000W5-BU for submit <at> debbugs.gnu.org; Sat, 06 Apr 2024 17:18:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53964) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <janneke@HIDDEN>) id 1rtDQl-0000T5-4i for 70169 <at> debbugs.gnu.org; Sat, 06 Apr 2024 17:18:33 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <janneke@HIDDEN>) id 1rtDQZ-0004IM-FG; Sat, 06 Apr 2024 17:18:19 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=kJkPEuBS6Tng8U0nDPaxbNFVTytFQvDJa37VsSK4HZs=; b=Bqoqs1panmwO413iGQsQ /YvsVkSwXs9rrVuJhFJrMyvA8hIWr4Ghgy6eUMXuM3sx06ssLqZIkaY9Q3RzmuQ85V5PHPhxdzGiQ 04VHD3of+lDfPqAQLaCqKEPl+Osv44dOxGbQs7L2V9AUphI/J+GcKQgLni6ZdZb5d7aicTb6BZmjb 5kGZGZaV/zgp/iKCAP/pry5olsrDLuec41zYjUPC68QlGwB23iIxyx5Jn2EfggWuD99XOejHaX8he EKon7bl9A5qe3cgZUZjImAKV8GXaMJtKqDZQQHjoCZc7ifbejkI2fjMzBWGeGdzR/DiLe2Zqc5qMX r5NCQ5xxz0IsKw==; From: Janneke Nieuwenhuizen <janneke@HIDDEN> To: 70169 <at> debbugs.gnu.org Subject: [PATCH v2 08/12] maint: Use reproducible Git timestamp for POT-Creation-Date. Date: Sat, 6 Apr 2024 23:18:00 +0200 Message-ID: <0761c8a153cb6e4e6144f57c2fa7eb0fc70c2950.1712437365.git.janneke@HIDDEN> X-Mailer: git-send-email 2.41.0 In-Reply-To: <cover.1712437365.git.janneke@HIDDEN> References: <cover.1712437365.git.janneke@HIDDEN> MIME-Version: 1.0 X-Debbugs-Cc: Florian Pelz <pelzflorian@HIDDEN>, Julien Lepiller <julien@HIDDEN> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 70169 X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -3.3 (---) * po/doc/local.mk (%D%/%.pot): Replace POT-Creation-Date using timestamp from Git. (%D%/guix-manual.pot): Likewise. Change-Id: I1b7f8cc147084c1804deb7be9d36e5eeda2599cb --- po/doc/local.mk | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/po/doc/local.mk b/po/doc/local.mk index dd6ba30133..77ec4721e3 100644 --- a/po/doc/local.mk +++ b/po/doc/local.mk @@ -1,6 +1,7 @@ # GNU Guix --- Functional package management for GNU # Copyright © 2018 Julien Lepiller <julien@HIDDEN> # Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@HIDDEN> +# Copyright © 2024 Janneke Nieuwenhuizen <janneke@HIDDEN> # # This file is part of GNU Guix. # @@ -44,12 +45,19 @@ POT_OPTIONS = \ --msgid-bugs-address "bug-guix@HIDDEN" %D%/%.pot: $(srcdir)/doc/%.texi - $(AM_V_PO4A)$(PO4A_UPDATEPO) -M UTF-8 -f texinfo -m "$<" \ - -p "$@" $(POT_OPTIONS) && \ - touch $@ + $(AM_V_PO4A)$(PO4A_UPDATEPO) -M UTF-8 -f texinfo -m "$<" \ + -p "$@-t" $(POT_OPTIONS) + date="$$(git log --pretty=format:%ci -n 1 -- $< 2>/dev/null \ + || echo $(SOURCE_DATE_EPOCH))" \ + sed -ri -e "s,^(.POT-Creation-Date: )[^\]*,\1$$date," "$@-t" + mv "$@-t" "$@" %D%/guix-manual.pot: %D%/guix.pot %D%/contributing.pot - msgcat $^ > $@ + msgcat $^ > "$@-t" + date="$$(git log --pretty=format:%ci -n 1 -- $< 2>/dev/null \ + || echo $(SOURCE_DATE_EPOCH))" \ + sed -ri "s,^(.POT-Creation-Date: )[^\]*,\1$$date," "$@-t" + mv "$@-t" "$@" doc-pot-update: %D%/guix-manual.pot %D%/guix-cookbook.pot .PHONY: doc-pot-update -- 2.41.0
pelzflorian@HIDDEN, julien@HIDDEN, guix-patches@HIDDEN:bug#70169; Package guix-patches.
Full text available.
Received: (at 70169) by debbugs.gnu.org; 6 Apr 2024 21:18:42 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sat Apr 06 17:18:42 2024
Received: from localhost ([127.0.0.1]:41133 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rtDQu-0000Vq-QT
for submit <at> debbugs.gnu.org; Sat, 06 Apr 2024 17:18:42 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:53958)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <janneke@HIDDEN>) id 1rtDQk-0000Sr-9W
for 70169 <at> debbugs.gnu.org; Sat, 06 Apr 2024 17:18:32 -0400
Received: from fencepost.gnu.org ([2001:470:142:3::e])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <janneke@HIDDEN>)
id 1rtDQY-0004Hg-JJ; Sat, 06 Apr 2024 17:18:18 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To:
From; bh=5f51ZRcnHNEpCFQtNyXonoM9juLiNt3lIbdge0bzb7s=; b=PbrZdlgqPi3q2xQNVv8K
gGRhaNeC4uLd6LGSWH8vLWNEeKXmRO5EkglDJTTjiX3tX0Rkp6ev+ck3LuW4m42GclTtDNoTFsa43
433socCr1XHmTJmnQg60LCc+phhpJwDX9QmwdcCuZ+9BJlbp/R6ULvib4SAzufg40yceymoPXLgP5
ghgm7Hpq/m36JSEVCRTXQgZrwp7sORlGL5cvP2iOjuc8vo4pxbedY//kWMsaZSXKgI+cii2qdRsOM
vDAewcZZOk1rz1xpmiEoPc1TFN4dQFJ8iSOamQC4fyCaa5YkdLuDWipAjKrame156rx39ZXWCY65j
/iDt+Uq5kjb+Cw==;
From: Janneke Nieuwenhuizen <janneke@HIDDEN>
To: 70169 <at> debbugs.gnu.org
Subject: [PATCH v2 07/12] maint: Use xgettext.scm wrapper to create .PO files
reproducibly.
Date: Sat, 6 Apr 2024 23:17:59 +0200
Message-ID: <83a27ee0460886ac9802caa34addd8d111acf68a.1712437365.git.janneke@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1712437365.git.janneke@HIDDEN>
References: <cover.1712437365.git.janneke@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Florian Pelz <pelzflorian@HIDDEN>,
Julien Lepiller <julien@HIDDEN>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 70169
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
* build-aux/xgettext.scm: New script.
* po/guix/Makevars (XGETTEXT): Set it.
(XGETTEXT_OPTIONS): Add --xgettext option to `real' xgettext.
* po/packages/Makevars (XGETTEXT): Set it.
(XGETTEXT_OPTIONS): Add --xgettext option to `real' xgettext.
Change-Id: I71b6b843970090f765f46ac346b92a346560e3f0
---
build-aux/xgettext.scm | 87 ++++++++++++++++++++++++++++++++++++++++++
po/guix/Makevars | 7 +++-
po/packages/Makevars | 10 ++++-
3 files changed, 101 insertions(+), 3 deletions(-)
create mode 100755 build-aux/xgettext.scm
diff --git a/build-aux/xgettext.scm b/build-aux/xgettext.scm
new file mode 100755
index 0000000000..e8a970f251
--- /dev/null
+++ b/build-aux/xgettext.scm
@@ -0,0 +1,87 @@
+#! /bin/sh
+# -*-scheme-*-
+build_aux=$(dirname $0)
+srcdir=$build_aux/..
+exec guile --no-auto-compile -L $srcdir -C $srcdir -e main -s "$0" "$@"
+!#
+
+;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@HIDDEN>
+;;;
+;;; This program is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; This program is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+;;;; Commentary:
+;;;
+;;; This script provides an xgettext wrapper to (re)set POT-Creation-Date from
+;;; a Git timestamp. Test doing something like:
+;;;
+;;; build-aux/xgettext.scm --files-from=po/guix/POTFILES.in --default-domain=test
+;;;
+;;;; Code:
+
+(use-modules (srfi srfi-1)
+ (srfi srfi-26)
+ (ice-9 curried-definitions)
+ (ice-9 match)
+ (ice-9 popen)
+ (ice-9 rdelim)
+ (guix build utils))
+
+(define ((option? name) option)
+ (string-prefix? name option))
+
+(define (get-option args name)
+ (let ((option (find (option? name) args)))
+ (and option
+ (substring option (string-length name)))))
+
+(define (pipe-command command)
+ (let* ((port (apply open-pipe* OPEN_READ command))
+ (output (read-string port)))
+ (close-port port)
+ output))
+
+
+;;;
+;;; Entry point.
+;;;
+(define (main args)
+ ;; Cater for being run in a container.
+ (setenv "LC_ALL" "en_US.UTF-8")
+ (setenv "TZ" "UTC0")
+ (fluid-set! %default-port-encoding #f)
+ (let* ((files-from (get-option args "--files-from="))
+ (default-domain (get-option args "--default-domain="))
+ (directory (or (get-option args "--directory=") "."))
+ (xgettext (or (get-option args "--xgettext=") "xgettext"))
+ (xgettext-args (filter (negate (option? "--xgettext=")) args))
+ (command (match xgettext-args
+ ((xgettext.scm args ...)
+ `(,xgettext ,@args))))
+ (result (apply system* command))
+ (status (/ result 256)))
+ (if (or (not (zero? status))
+ (not files-from))
+ (exit status)
+ (let* ((text (with-input-from-file files-from read-string))
+ (lines (string-split text #\newline))
+ (files (filter (negate (cute string-prefix? "#" <>)) lines))
+ (files (map (cute string-append directory "/" <>) files))
+ (git-command `("git" "log" "--pretty=format:%ci" "-n1" ,@files))
+ (timestamp (pipe-command git-command))
+ (po-file (string-append default-domain ".po")))
+ (when (string-null? timestamp)
+ (exit 1))
+ (substitute* po-file
+ (("(\"POT-Creation-Date: )[^\\]*" all header)
+ (string-append header timestamp)))))))
diff --git a/po/guix/Makevars b/po/guix/Makevars
index 88a4e8c7bc..4cfd0f431d 100644
--- a/po/guix/Makevars
+++ b/po/guix/Makevars
@@ -5,6 +5,10 @@ DOMAIN = guix
subdir = po/guix
top_builddir = ../..
+# We use our xgettext.scm wrapper to produce .PO files reproducibly using a
+# timestamp from Git.
+XGETTEXT:=$(top_srcdir)/build-aux/xgettext.scm
+
# These options get passed to xgettext. We want to catch standard
# gettext uses, and SRFI-35 error condition messages. In C++ code
# we use 'n_' instead of the more usual 'N_' for no-ops.
@@ -14,7 +18,8 @@ XGETTEXT_OPTIONS = \
--keyword=message \
--keyword=description \
--keyword=synopsis \
- --keyword=n_
+ --keyword=n_ \
+ --xgettext=$(XGETTEXT_)
COPYRIGHT_HOLDER = the authors of Guix (msgids)
diff --git a/po/packages/Makevars b/po/packages/Makevars
index 65912786d8..0ba4f1ba7e 100644
--- a/po/packages/Makevars
+++ b/po/packages/Makevars
@@ -6,12 +6,18 @@ DOMAIN = guix-packages
subdir = po/packages
top_builddir = ../..
+# We use our xgettext.scm wrapper to produce .PO files reproducibly using a
+# timestamp from Git. The `real' xgettext is passed as an option to
+# xgettext.scm
+XGETTEXT:=$(top_srcdir)/build-aux/xgettext.scm
+
# These options get passed to xgettext. We want to catch exclusively package
# synopses and descriptions.
XGETTEXT_OPTIONS = \
--language=Scheme --from-code=UTF-8 \
- --keyword=synopsis --keyword=description \
- --keyword=output-synopsis:2
+ --keyword=synopsis --keyword=description \
+ --keyword=output-synopsis:2 \
+ --xgettext=$(XGETTEXT_)
COPYRIGHT_HOLDER = the authors of Guix (msgids)
--
2.41.0
pelzflorian@HIDDEN, julien@HIDDEN, guix-patches@HIDDEN:bug#70169; Package guix-patches.
Full text available.
Received: (at 70169) by debbugs.gnu.org; 6 Apr 2024 21:18:36 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sat Apr 06 17:18:36 2024
Received: from localhost ([127.0.0.1]:41131 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rtDQq-0000V4-1p
for submit <at> debbugs.gnu.org; Sat, 06 Apr 2024 17:18:36 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:53948)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <janneke@HIDDEN>) id 1rtDQj-0000Sn-NQ
for 70169 <at> debbugs.gnu.org; Sat, 06 Apr 2024 17:18:31 -0400
Received: from fencepost.gnu.org ([2001:470:142:3::e])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <janneke@HIDDEN>)
id 1rtDQX-0004H5-PV; Sat, 06 Apr 2024 17:18:18 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To:
From; bh=HNT9nkecpX7lGGEUPD0bYWW3ju2ZRg/oGPJpCmOYDRA=; b=HKGdmdCSWNAQzlo5/EtV
Ny20v3GgOlgvvFv55BR9y3QGcWA7Tx3EpRxHba0NAWVdu9vKHQOyjM88vWI6ua+m2TwZG92+j9tdx
lM2VxHdBonXmOvj5KkQlhngq8U0IBraMpIQhT8Gd5CJuZJWbbQ2EeOoaDopleRO56lOHfj+CXiNdH
DIxhhSGZm8EQP6erDQC/Va/3glODMCUmIex+p5KVwGjuOO5dteS8D3gL76fbeZ/EnWLs8OpGJq5dJ
BsFH2Qiuunuu2lk4kdjqulqpvj+FPMBRuBQc6B10BbiToWWjxNaTM9mApY8T7A6aHxVsCwuqlMRmm
fpPNXmk+jR15eg==;
From: Janneke Nieuwenhuizen <janneke@HIDDEN>
To: 70169 <at> debbugs.gnu.org
Subject: [PATCH v2 06/12] maint: Generate 'doc/version-LANG.texi' reproducibly.
Date: Sat, 6 Apr 2024 23:17:58 +0200
Message-ID: <dc9b0c95813c735bca8de5e0bbcea0fd63eb526a.1712437365.git.janneke@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1712437365.git.janneke@HIDDEN>
References: <cover.1712437365.git.janneke@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 70169
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
* doc/local.mk ($(srcdir)/doc/stamp-vti): Change rule into...
(version.texi-from-git): ...this new function. Call it with vti,guix.texi,;
and for all MANUAL_LANGUAGES with $(i),po/doc/guix-manual.$(lang).po,
-$(lang.po).
Change-Id: Ia8df618178066cad320eecea0299337224e23a73
---
doc/local.mk | 44 ++++++++++++++++++++++++++++++--------------
1 file changed, 30 insertions(+), 14 deletions(-)
diff --git a/doc/local.mk b/doc/local.mk
index 017686137a..c355bec8d7 100644
--- a/doc/local.mk
+++ b/doc/local.mk
@@ -6,6 +6,7 @@
# Copyright © 2016, 2018 Mathieu Lirzin <mthl@HIDDEN>
# Copyright © 2018, 2021 Julien Lepiller <julien@HIDDEN>
# Copyright © 2019 Timothy Sample <samplet@HIDDEN>
+# Copyright © 2024 Janneke Nieuwenhuizen <janneke@HIDDEN>
#
# This file is part of GNU Guix.
#
@@ -254,19 +255,34 @@ endif
# Reproducible tarball
-# Generate 'version.texi' reproducibly using metadata from Git rather
-# than using metadata from the filesystem.
-$(srcdir)/doc/stamp-vti: $(srcdir)/doc/guix.texi $(top_srcdir)/configure
- $(AM_V_GEN)set -e \
+# Define a rule to build `version[LANG].texi' reproducibly using metadata from
+# Git rather than using metadata from the filesystem.
+define version.texi-from-git
+$(srcdir)/doc/stamp-$(1): $(srcdir)/$(2) $(top_srcdir)/configure
+ $$(AM_V_GEN)set -e \
export LC_ALL=C; \
export TZ=UTC0; \
- timestamp=$$(git log --pretty=format:%ct -n1 -- $< 2>/dev/null \
- || echo $(SOURCE_DATE_EPOCH)) \
- dmy=$$(date --date="@$$timestamp" "+%-d %B %Y"); \
- my=$$(date --date="@$$timestamp" "+%B %Y"); \
- { echo "@set UPDATED $$dmy"; \
- echo "@set UPDATED-MONTH $$my"; \
- echo "@set EDITION $(VERSION)"; \
- echo "@set VERSION $(VERSION)"; } > $@-t; \
- mv $@-t $@
- @cp $@ $(srcdir)/doc/version.texi
+ timestamp="$$$$(git log --pretty=format:%ct -n1 -- "$$<" \
+ 2>/dev/null \
+ || echo $$(SOURCE_DATE_EPOCH))" \
+ dmy=$$$$(date --date="@$$$$timestamp" "+%-d %B %Y"); \
+ my=$$$$(date --date="@$$$$timestamp" "+%B %Y"); \
+ { echo "@set UPDATED $$$$dmy"; \
+ echo "@set UPDATED-MONTH $$$$my"; \
+ echo "@set EDITION $$$(VERSION)"; \
+ echo "@set VERSION $$$(VERSION)"; } > "$$@-t";
+ mv "$$@-t" "$$@"
+ cp -p "$$@" "$$(srcdir)/doc/version$(3).texi"
+endef
+
+# Generate rules for stamp-vti and stamp-N that create version.texi and
+# version-LANG.texi to override the Autotools versions that use timestamps
+# embedded in the file-system. These are expected to generate warnings:
+#
+# Makefile:7376: warning: overriding recipe for target 'doc/stamp-vti'
+# Makefile:5098: warning: ignoring old recipe for target 'doc/stamp-vti'
+i:=0
+$(eval $(call version.texi-from-git,vti,doc/guix.texi,))
+$(foreach lang, $(MANUAL_LANGUAGES), \
+ $(eval i=$(shell echo $$(($(i)+1)))) \
+ $(eval $(call version.texi-from-git,$(i),po/doc/guix-manual.$(lang).po,-$(lang))))
--
2.41.0
guix-patches@HIDDEN:bug#70169; Package guix-patches.
Full text available.Received: (at 70169) by debbugs.gnu.org; 6 Apr 2024 21:18:36 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sat Apr 06 17:18:36 2024 Received: from localhost ([127.0.0.1]:41127 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rtDQo-0000Ue-Ez for submit <at> debbugs.gnu.org; Sat, 06 Apr 2024 17:18:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53932) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <janneke@HIDDEN>) id 1rtDQi-0000Sb-Jb for 70169 <at> debbugs.gnu.org; Sat, 06 Apr 2024 17:18:29 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <janneke@HIDDEN>) id 1rtDQW-0004Gf-TP; Sat, 06 Apr 2024 17:18:16 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=vZV5aanlKae8+jEsGbA35h7ylNyCY4uimTnUCj7S4N0=; b=nv9Xb7JlnrmtdQU0CWS6 yU5ijV5zKf2j1MUO7FV4WYF9Zpc0wkfChrYjQHAFEUj8PZIsJ2/4OFwBYA/Ef5EOIlXEQSLbbNkCV aqF+88VokbSLcavFLKFgSBkxIbX+hkUKSYFwyQN69WlbDPLtYR46l3IRpjZt7dGzxpxpwYxowQBMR S7HYkyMUfj1e5NgMuFg4FNyawIAbW+ahopt7Uu4QYY7jATpkEeTfDk1UuyVZkp0yYgFaJZBxVHWfH tPtd/urLVamRBDu60ci9ZgQPC/G7E6Jh6utWhejP7KiqPktl2htP4TUgMAErrhFe7BR7a3n1v148Y K3zNNP03u1FLUg==; From: Janneke Nieuwenhuizen <janneke@HIDDEN> To: 70169 <at> debbugs.gnu.org Subject: [PATCH v2 05/12] maint: Generate AUTHORS and ChangeLog reproducibly. Date: Sat, 6 Apr 2024 23:17:57 +0200 Message-ID: <535e975e124a2c9f82cf683728ca25fcf30f7948.1712437365.git.janneke@HIDDEN> X-Mailer: git-send-email 2.41.0 In-Reply-To: <cover.1712437365.git.janneke@HIDDEN> References: <cover.1712437365.git.janneke@HIDDEN> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 70169 X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -3.3 (---) * Makefile.am (gen-ChangeLog): Set LC_ALL=en_US.UTF-8 TZ=UTC0. (gen-AUTHORS): Likewise. Change-Id: I109ceffdf07b8dde6385b6b509366c47564c9f31 --- Makefile.am | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Makefile.am b/Makefile.am index a5e49bc406..7af88b2988 100644 --- a/Makefile.am +++ b/Makefile.am @@ -974,6 +974,8 @@ gen-tarball-version: gen-ChangeLog: $(AM_V_GEN)if test -e .git; then \ + export LC_ALL=en_US.UTF-8; \ + export TZ=UTC0; \ $(top_srcdir)/build-aux/gitlog-to-changelog \ > $(distdir)/ChangeLog.tmp; \ rm -f $(distdir)/ChangeLog; \ @@ -983,6 +985,8 @@ gen-ChangeLog: gen-AUTHORS: $(AM_V_GEN)if test -e .git; then \ rm -f "$(distdir)/AUTHORS"; \ + export LC_ALL=en_US.UTF-8; \ + export TZ=UTC0; \ $(top_builddir)/pre-inst-env "$(GUILE)" \ "$(top_srcdir)/build-aux/generate-authors.scm" \ "$(top_srcdir)" "$(distdir)/AUTHORS"; \ -- 2.41.0
guix-patches@HIDDEN:bug#70169; Package guix-patches.
Full text available.Received: (at 70169) by debbugs.gnu.org; 6 Apr 2024 21:18:35 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sat Apr 06 17:18:34 2024 Received: from localhost ([127.0.0.1]:41119 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rtDQl-0000Tu-Ky for submit <at> debbugs.gnu.org; Sat, 06 Apr 2024 17:18:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53922) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <janneke@HIDDEN>) id 1rtDQh-0000SX-KS for 70169 <at> debbugs.gnu.org; Sat, 06 Apr 2024 17:18:27 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <janneke@HIDDEN>) id 1rtDQV-0004GC-Uu; Sat, 06 Apr 2024 17:18:15 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=h8E2k4aIwAq0oD4jCXkkvLkWXalj87urDy7/BGvGZfg=; b=lf3HPxwZMyHVMbIh5wNl E6D9aqvq2EFu1V+wRu6IyC0SACgLszgfwykuh0kVoDP62eptBy9VSM/INwgGvkYJQXv6iXvOkfdt/ aW8S/3Wnb8U0Ucdj7zPpla+DD+kbCoDiFi1Jsdcn60wE/VGMEChh4Npa9OQLUNCI0uFxx+KNLylQ/ RVfPZojAf3M+zQvG5OWh/IDMvR888njZgX6TQorff4cPXhD10R0e3AO++Y/tIPgw5kl+UITrkspM0 HbYi/6y5bcdSh+xpwwt1dWEgy1jgenN1kVGGFWPtyKkmEU62HpMF2fGBlGtpqbWl47klJzeBeiehS 91xnjPU6Slihnw==; From: Janneke Nieuwenhuizen <janneke@HIDDEN> To: 70169 <at> debbugs.gnu.org Subject: [PATCH v2 04/12] maint: Help help2man generate reproducible man-pages. Date: Sat, 6 Apr 2024 23:17:56 +0200 Message-ID: <34915f43ed2e8b7ae99c3fe2fd65e7b97ff8f57b.1712437365.git.janneke@HIDDEN> X-Mailer: git-send-email 2.41.0 In-Reply-To: <cover.1712437365.git.janneke@HIDDEN> References: <cover.1712437365.git.janneke@HIDDEN> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 70169 X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -3.3 (---) * doc/local.mk (SOURCE_DATE_EPOCH): New exported variable. Change-Id: I6636693695d5502657f1475d93d31949e0b0b39d --- doc/local.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/local.mk b/doc/local.mk index 5f014b9c3d..017686137a 100644 --- a/doc/local.mk +++ b/doc/local.mk @@ -224,6 +224,9 @@ gen_man = \ $(HELP2MANFLAGS) HELP2MANFLAGS = --source=GNU --info-page=$(PACKAGE_TARNAME) +# help2man reproducibility +SOURCE_DATE_EPOCH = $(shell git show HEAD --format=%ct --no-patch 2>/dev/null || echo 0) +export SOURCE_DATE_EPOCH $(srcdir)/%D%/guix.1: scripts/guix.in $(sub_commands_mans) -$(AM_V_HELP2MAN)$(gen_man) --output="$@" `basename "$@" .1` -- 2.41.0
guix-patches@HIDDEN:bug#70169; Package guix-patches.
Full text available.
Received: (at 70169) by debbugs.gnu.org; 6 Apr 2024 21:18:29 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sat Apr 06 17:18:29 2024
Received: from localhost ([127.0.0.1]:41111 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rtDQi-0000TK-Q5
for submit <at> debbugs.gnu.org; Sat, 06 Apr 2024 17:18:29 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:53912)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <janneke@HIDDEN>) id 1rtDQf-0000SS-BH
for 70169 <at> debbugs.gnu.org; Sat, 06 Apr 2024 17:18:26 -0400
Received: from fencepost.gnu.org ([2001:470:142:3::e])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <janneke@HIDDEN>)
id 1rtDQT-0004Ec-L4; Sat, 06 Apr 2024 17:18:13 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To:
From; bh=6PcbzI8Tvzh+9t6jWSV4bp1geKrDMl7v8LvWcHhZagE=; b=GGshh9xgA2VD++VlRlZQ
HF+znfEI3UUPHdC0Hl6GR9UwuspgizKurpG7Nikn2Js3O5L4BpAuGK9XgbSfwdrzGoXB4wloVnRVb
2NdxIEfsQ5fiiYRk6Mlowtv0MPbOIOlNEGRnG0EoTgcxLbvhyIIj9LgdJU+sfHr6Mi/3oHjQ1fnJW
xzLXcbBVze50S7Gey4SJPnE16EAq+z+H1/coEuMXtR4dNjAKVbXt3xwf2F9CeAMHR4IWD9bgz39n5
XTPYeTBw/SG5XhgixdeyF2s6h995Dv6AxVtLca7grnzrTaeuUvapAXtf1M6HJkWrcXsX8GtODmsJR
4tKfOeQxR/SL+Q==;
From: Janneke Nieuwenhuizen <janneke@HIDDEN>
To: 70169 <at> debbugs.gnu.org
Subject: [PATCH v2 02/12] maint: Use reproducible timestamps and name for
tarball.
Date: Sat, 6 Apr 2024 23:17:54 +0200
Message-ID: <64f881308ffd375845708caf00ced3879cb578e4.1712437365.git.janneke@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1712437365.git.janneke@HIDDEN>
References: <cover.1712437365.git.janneke@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 70169
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
* Makefile.am (gen-tarball-version): Add reproducible timestamp to tarball.
(am__tar): Use it in new variable, overriding the Automake default.
(GZIP_ENV): New variable, overriding the Automake default.
---
Makefile.am | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/Makefile.am b/Makefile.am
index 2b5e145095..a5e49bc406 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,7 +7,7 @@
# Copyright © 2017 Mathieu Othacehe <m.othacehe@HIDDEN>
# Copyright © 2017 Leo Famulari <leo@HIDDEN>
# Copyright © 2017 Ricardo Wurmus <rekado@HIDDEN>
-# Copyright © 2017, 2020, 2023 Janneke Nieuwenhuizen <janneke@HIDDEN>
+# Copyright © 2017, 2020, 2023, 2024 Janneke Nieuwenhuizen <janneke@HIDDEN>
# Copyright © 2017 Arun Isaac <arunisaac@HIDDEN>
# Copyright © 2018 Nikita <nikita@HIDDEN>
# Copyright © 2018 Julien Lepiller <julien@HIDDEN>
@@ -970,6 +970,7 @@ $(top_srcdir)/.version: config.status
gen-tarball-version:
echo $(VERSION) > "$(distdir)/.tarball-version"
+ git show HEAD --format=%ct --no-patch > $(distdir)/.tarball-timestamp
gen-ChangeLog:
$(AM_V_GEN)if test -e .git; then \
@@ -1002,6 +1003,17 @@ dist-with-updated-version:
# Release management.
#
+# Reproducible tarball
+override GZIP_ENV = --best --no-name
+# Be friendly to Debian; avoid using EPOCH
+override am__tar = $${TAR-tar} \
+ --sort=name \
+ --mode=go=rX,u+rw,a-s \
+ --mtime=@$$(cat "$$tardir"/.tarball-timestamp) \
+ --owner=0 --group=0 --numeric-owner \
+ -cf - \
+ "$$tardir"
+
releasedir = release-$(PACKAGE_VERSION)
PACKAGE_FULL_TARNAME = $(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
--
2.41.0
guix-patches@HIDDEN:bug#70169; Package guix-patches.
Full text available.Received: (at 70169) by debbugs.gnu.org; 6 Apr 2024 21:18:25 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sat Apr 06 17:18:25 2024 Received: from localhost ([127.0.0.1]:41101 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rtDQf-0000Sq-A1 for submit <at> debbugs.gnu.org; Sat, 06 Apr 2024 17:18:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53900) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <janneke@HIDDEN>) id 1rtDQe-0000S7-62 for 70169 <at> debbugs.gnu.org; Sat, 06 Apr 2024 17:18:24 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <janneke@HIDDEN>) id 1rtDQS-0004Dx-GG; Sat, 06 Apr 2024 17:18:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=q+rZKnDHKGZdZJcJPA/zMKlTSK8VKTBca9VS8g34lA8=; b=Cf8z/Gv9j7l3W03K6lsC mL3B2CD6ti3YBdZMJKWFoJIQlZnuZljvuW9dO8LeI4CwyZnpMF23DkXuJF8KtuTfuuC4V64TeNRLg MOH1GrbDJpEvhAIGaKW8s0HJwdegfR/uRiyY61YQVA79j5beuaYr7QR0oG90hPC1JY9w23Uv7M24J 6+vUTJiDRHf+t+HZJnVLNeBAdk4TxMShccomtaP5WMSnu/QPEpggZqupbd3a6OPmbK3crHP+5PZZ+ L4OYh6QKqMMUaI0o/69aWhgHkfsnjEvl7FfkutZLAErYqBtCz68/YN895Wmdqn24jsk0375XJD8Cl uyD/YycHQHMUVw==; From: Janneke Nieuwenhuizen <janneke@HIDDEN> To: 70169 <at> debbugs.gnu.org Subject: [PATCH v2 01/12] maint: Cater for running `make dist' from a worktree. Date: Sat, 6 Apr 2024 23:17:53 +0200 Message-ID: <3f5f29f3a3f29a9e09a9275e8c10ef8b8a4cc779.1712437365.git.janneke@HIDDEN> X-Mailer: git-send-email 2.41.0 In-Reply-To: <cover.1712437365.git.janneke@HIDDEN> References: <cover.1712437365.git.janneke@HIDDEN> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 70169 X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -3.3 (---) * Makefile.am (gen-ChangeLog): Check for existance of `.git', rather than it being a directory. (gen-AUTHORS): Likewise. Change-Id: I1b7f8cc147084c1804deb7be9d36e5eeda2599cb --- Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 1c5688ac13..2b5e145095 100644 --- a/Makefile.am +++ b/Makefile.am @@ -972,7 +972,7 @@ gen-tarball-version: echo $(VERSION) > "$(distdir)/.tarball-version" gen-ChangeLog: - $(AM_V_GEN)if test -d .git; then \ + $(AM_V_GEN)if test -e .git; then \ $(top_srcdir)/build-aux/gitlog-to-changelog \ > $(distdir)/ChangeLog.tmp; \ rm -f $(distdir)/ChangeLog; \ @@ -980,7 +980,7 @@ gen-ChangeLog: fi gen-AUTHORS: - $(AM_V_GEN)if test -d .git; then \ + $(AM_V_GEN)if test -e .git; then \ rm -f "$(distdir)/AUTHORS"; \ $(top_builddir)/pre-inst-env "$(GUILE)" \ "$(top_srcdir)/build-aux/generate-authors.scm" \ -- 2.41.0
guix-patches@HIDDEN:bug#70169; Package guix-patches.
Full text available.
Received: (at 70169) by debbugs.gnu.org; 6 Apr 2024 21:18:25 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sat Apr 06 17:18:25 2024
Received: from localhost ([127.0.0.1]:41099 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rtDQe-0000So-Ru
for submit <at> debbugs.gnu.org; Sat, 06 Apr 2024 17:18:25 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:53888)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <janneke@HIDDEN>) id 1rtDQd-0000Ru-1z
for 70169 <at> debbugs.gnu.org; Sat, 06 Apr 2024 17:18:24 -0400
Received: from fencepost.gnu.org ([2001:470:142:3::e])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <janneke@HIDDEN>)
id 1rtDQR-0004Dl-By; Sat, 06 Apr 2024 17:18:11 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
s=fencepost-gnu-org; h=MIME-Version:Date:Subject:To:From:in-reply-to:
references; bh=EN/2xuhqTlrJCVc4mhPOJ3hBjPiFTsGiST/OWrbFz2Q=; b=lqWpSdhezksVvl
NWdz0a6Hk7p4VoPqroe3NSGsInYfDKmiCrHaYEx5TpwqCZl3YwzDTjEHUIXInANdGKvPBk5h54iQ0
G8dpVZHIa7CKV8HM/pdZ4BrCh0N9j7AgHBOdjS/kIn/oTE0mcqtZqb4HMmigE2dDp0XeTSXpwo/5e
wb8n374Sd32CdgDOQ7PAREv4z2bJVNui6PxVy9AdNbjJPR/KtLyRKaTxxMNrt99OUUgvCW9LQvxbN
nHLfCcm3crMNQgc30uRrES0KR/JsiVPBT7Fc33Ki9PwqLimPHCjhDFK+1G1jcTf1PCQ/lZ+SU49eo
cO4EecgFxCKIXRTskdTQ==;
From: Janneke Nieuwenhuizen <janneke@HIDDEN>
To: 70169 <at> debbugs.gnu.org
Subject: [PATCH v2 00/12] Reproducible `make dist' tarball in defiance of
Autotools and Gettext
Date: Sat, 6 Apr 2024 23:17:52 +0200
Message-ID: <cover.1712437365.git.janneke@HIDDEN>
X-Mailer: git-send-email 2.41.0
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 70169
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
Thanks for your support and to all who helped testing!
V2 brings
* Use `override' with GZIP_ENV and am__tar to avoid warnings,
* Add --best to GZIP_ENV (i.e., keep using --best),
* Generate AUTHORS and ChangeLog reproducibly by setting TZ and LC_ALL,
* Use double quotes for file-name variables in amended pot rules,
* Generate POT files reproducibly using a new, naive xgettext.scm script,
* Remove %%CreationDate from generated EPS files,
* Reset CreationDate in generated PDF files,
* Fix dist -> auto-clean -> doc-pot-update dependency,
* Remove more Autotools caches (.am*, m4/, po/),
* Document the expected override warnings for stamp-vti, stamp-N, and
* A toplevel assert that Autotools cache is up-to-date with Git HEAD.
I have reset wip-tarball and uploaded
<https://lilypond.org/janneke/guix/guix-1.3.0.57430-933766.tar.gz>.
--8<---------------cut here---------------start------------->8---
guix hash guix-1.3.0.57430-933766.tar.gz
01v37vp7hcsfbjsrl22wb01aw6incrxn905rmg54l1svz351nri0
--8<---------------cut here---------------end--------------->8---
Note that you'll need an environment with something like
--8<---------------cut here---------------start------------->8---
guix shell -CP -m manifest.scm fontconfig font-ghostscript graphviz \
imagemagick texlive-bin
--8<---------------cut here---------------end--------------->8---
Phew! Almost starting to wonder why didn't I name the initial patch series `A
somewhat more reproducible tarball...' ;)
Greetings,
Janneke
Janneke Nieuwenhuizen (11):
maint: Cater for running `make dist' from a worktree.
maint: Use reproducible timestamps and name for tarball.
maint: Help help2man generate reproducible man-pages.
maint: Generate AUTHORS and ChangeLog reproducibly.
maint: Generate 'doc/version-LANG.texi' reproducibly.
maint: Use xgettext.scm wrapper to create .PO files reproducibly.
maint: Use reproducible Git timestamp for POT-Creation-Date.
maint: Remove %%CreationDate from generated EPS files
maint: Avoid PNG and PDF generation to fail silently.
maint: Reset CreationDate metadata on generated PDFs.
maint: Ensure generated file reproducibility for dist.
Timothy Sample (1):
maint: Generate 'doc/version.texi' reproducibly.
Makefile.am | 51 ++++++++++++++++++++---
build-aux/xgettext.scm | 87 +++++++++++++++++++++++++++++++++++++++
doc/local.mk | 92 ++++++++++++++++++++++++++++++++++++++----
po/doc/local.mk | 16 ++++++--
po/guix/Makevars | 7 +++-
po/packages/Makevars | 10 ++++-
6 files changed, 242 insertions(+), 21 deletions(-)
create mode 100755 build-aux/xgettext.scm
base-commit: df64d48e6f9f648044aa5279c045b8d6f7bee604
--
2.41.0
guix-patches@HIDDEN:bug#70169; Package guix-patches.
Full text available.
Received: (at 70169) by debbugs.gnu.org; 6 Apr 2024 21:16:25 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sat Apr 06 17:16:25 2024
Received: from localhost ([127.0.0.1]:41092 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rtDOj-0000H9-5f
for submit <at> debbugs.gnu.org; Sat, 06 Apr 2024 17:16:25 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:55748)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <janneke@HIDDEN>) id 1rtDOg-0000GK-Bf
for 70169 <at> debbugs.gnu.org; Sat, 06 Apr 2024 17:16:23 -0400
Received: from fencepost.gnu.org ([2001:470:142:3::e])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <janneke@HIDDEN>)
id 1rtDOU-0003xG-G1; Sat, 06 Apr 2024 17:16:10 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To:
From; bh=VXBD53Y9JTv4UtahmVuNeZmgIvcVdTuuCMwaw2qADVE=; b=mbRV5WgRwy83/809++cb
aQcjtGfalBKV8mIYslhDUfDt8aqF1PJazbXgt1b+PlMKvJBV01wpE0eh4VRexBQpqu3/UaB63jczK
idEnPjhA/nNfqNjhDdFwNo0/v50JJShFbtBUtdGbjsCr3mHwrH6V7sePjN5zYzPlIyEn9nNwBz7pt
luU/S//ZHZe14/di0Re0uXdPatVt76INPkmQiqrJ4q3joRET3tDbDBtLWK6IszdvKFnsUMFTEmarq
7Trzs96OpEsmcCIR0qi80j+Dv97+ZXjhrOsJOAvQJNY+elMjEuEBIx6c68wEbFAgKIzoe2cQ1jB1O
67w/XfUNYmkD6A==;
From: Janneke Nieuwenhuizen <janneke@HIDDEN>
To: Ludovic =?utf-8?Q?Court=C3=A8s?= <ludo@HIDDEN>
Subject: Re: [bug#70169] [PATCH 0/7] Reproducible `make dist' tarball in
defiance of Autotools and Gettext
In-Reply-To: <87msqaw2yw.fsf@HIDDEN> ("Ludovic =?utf-8?Q?Court=C3=A8s=22'?=
=?utf-8?Q?s?= message of "Wed, 03 Apr 2024 23:28:23 +0200")
Organization: AvatarAcademy.nl
References: <cover.1712165977.git.janneke@HIDDEN> <87wmpew4e7.fsf@HIDDEN>
<87ttkinooh.fsf@HIDDEN> <87msqaw2yw.fsf@HIDDEN>
X-Url: http://AvatarAcademy.nl
Date: Sat, 06 Apr 2024 23:16:05 +0200
Message-ID: <874jcejip6.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 70169
Cc: 70169 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
Ludovic Court=C3=A8s writes:
Hello!
> Janneke Nieuwenhuizen <janneke@HIDDEN> skribis:
>
>> I boldly pushed `origin/wip-tarball', you may try that :)
>
> Silly me. =F0=9F=A4=A6
Yeah, when you see it, it's obvious :)
> First try: I wasn=E2=80=99t running in a UTF-8 locale (in =E2=80=98guix s=
hell -CP=E2=80=99) so I
> got things like this:
>
> =E2=94=82 =E2=94=9C=E2=94=80=E2=94=80 guix-1.3.0.57425-80a228/AUTHORS
[..]
> =E2=94=82 =E2=94=82 - 2306 Ludovic Court??s <ludo@HIDDEN>
> =E2=94=82 =E2=94=82 + 2306 Ludovic Court=C3=A8s <ludo@HIDDEN>
Ah, not good.
> Then there=E2=80=99s prolly a timezone issue with the generated ChangeLog:
>
> =E2=94=82 =E2=94=82 -2024-02-19 Troy Figiel <troy@HIDDEN>
> =E2=94=82 =E2=94=82 +2024-02-20 Troy Figiel <troy@HIDDEN>
> =E2=94=82 =E2=94=82=20=20
> =E2=94=82 =E2=94=82 gnu: Add go-github-com-coocood-freecache.
> =E2=94=82 =E2=94=82 * gnu/packages/golang-xyz.scm (go-github-com-cooc=
ood-freecache): New variable.
Yes!
> The best thing to do is probably to drop =E2=80=98ChangeLog=E2=80=99 gene=
ration (maybe
> =E2=80=98AUTHORS=E2=80=99 too) and just add a text inviting users to chec=
k the Git log.
I think AUTHORS and ChangeLog are amongst the simplest of our worries.
Setting TZ=3DUTC0 and LC_ALL=3Den_US.UTF-8 should address these.
> Then I must have stale =E2=80=98help2man=E2=80=99 byproducts:
>
> =E2=94=82 =E2=94=9C=E2=94=80=E2=94=80 guix-1.3.0.57425-80a228/doc/guix-ch=
allenge.1
> =E2=94=82 =E2=94=82 @@ -1,11 +1,11 @@
> =E2=94=82 =E2=94=82 .\" DO NOT MODIFY THIS FILE! It was generated by he=
lp2man 1.49.2.
> =E2=94=82 =E2=94=82 .TH GUIX "1" "April 2024" "GNU" "User Commands"
> =E2=94=82 =E2=94=82 .SH NAME
> =E2=94=82 =E2=94=82 -guix \- manual page for guix challenge (GNU Guix) 1.=
3.0.51884-370f8f3
> =E2=94=82 =E2=94=82 +guix \- manual page for guix challenge (GNU Guix) 1.=
3.0.57425-80a228
That looks like a dependency or parallelism problem. I made the
auto-clean dependency more strict and clean even more Autotools caching.
> Lots of differences in Info files:
> =E2=94=82 =E2=94=9C=E2=94=80=E2=94=80 guix-1.3.0.57425-80a228/doc/guix-co=
okbook.fr.info
> =E2=94=82 =E2=94=82=E2=94=84 xxd not available in path. Falling back to P=
ython hexlify.
> =E2=94=82 =E2=94=82 @@ -1,6 +1,8216 @@
Yeah, there's also something with the (building of) the cookbooks. I'm
hoping the strict auto-clean dependency fixes this too.
> Something with PO files not being regenerated (?):
>
> =E2=94=82 =E2=94=9C=E2=94=80=E2=94=80 guix-1.3.0.57425-80a228/po/packages=
/en@HIDDEN
> =E2=94=82 =E2=94=82 @@ -1,11 +1,11 @@
> =E2=94=82 =E2=94=82 # English translations for guix package.
> =E2=94=82 =E2=94=82 -# Copyright (C) 2020 the authors of Guix (msgids)
> =E2=94=82 =E2=94=82 +# Copyright (C) 2024 the authors of Guix (msgids)
Hmm. I've added a naive xgettext.scm wrapper to take care of this.
> Note that in =E2=80=98guix shell -CP=E2=80=99 I had no TZ and LC_* variab=
le set and
> /etc/timezone is missing.
Okay, thanks for the hint. "Of course", you'll have to use something
like
guix shell -CP -m manifest.scm fontconfig font-ghostscript \
graphviz imagemagick texlive-bin
to make it succeed now. When running in a container from a worktree
you'll also have to expose the master .git directory.
I fixed some image generation rules that would silently fail without
graphviz or imagemagic, or when fonts cannot be found.
> That=E2=80=99s it for today!
Thanks, find a V2 soon.
Greetings,
Janneke
--=20
Janneke Nieuwenhuizen <janneke@HIDDEN> | GNU LilyPond https://LilyPond.org
Freelance IT https://www.JoyOfSource.com | Avatar=C2=AE https://AvatarAcade=
my.com
guix-patches@HIDDEN:bug#70169; Package guix-patches.
Full text available.
Received: (at 70169) by debbugs.gnu.org; 4 Apr 2024 05:12:37 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Apr 04 01:12:37 2024
Received: from localhost ([127.0.0.1]:60144 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rsFOv-0003tt-95
for submit <at> debbugs.gnu.org; Thu, 04 Apr 2024 01:12:37 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:54772)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <janneke@HIDDEN>) id 1rsFOq-0003ss-Js
for 70169 <at> debbugs.gnu.org; Thu, 04 Apr 2024 01:12:35 -0400
Received: from fencepost.gnu.org ([2001:470:142:3::e])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <janneke@HIDDEN>)
id 1rsFOd-0002sl-G5; Thu, 04 Apr 2024 01:12:19 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To:
From; bh=GY5gwDx5DJ9T7OYv41YtQRrJ5AP/oWiFqkIZxcdL7bg=; b=aCa4igl5pBFQw1cB1chO
f+Y6oFKJ4KOHb3Rh/ARdZUtSgVIw1Z2UDZYTZhT+ZOzjuyYs3DDblCdhJCCOw0z50fdjVX0q3Jr1/
pRUfvm3ww56ZJ62We/KCVKGWeFSCeVWKnyRhgMyt1+9vYbJJbZymF4+xJrNJmHLUNMwwtM6pt/xsk
Z03Nj1FKA5RgE2sxuGqE7ixh/h78vMtesCqbRChhOiQwbxPtMfHpZn1lV8lwFGee9AUKcMGLPJxPS
J4n2znxN9hFM9S3OgTXc+PJiL5Me+qTknlO5Y4A1reRe9kW8VAOixw5ECGaakHWcaGFfbE4jBErpC
BGr7VzuUYuvg2Q==;
From: Janneke Nieuwenhuizen <janneke@HIDDEN>
To: Ludovic =?utf-8?Q?Court=C3=A8s?= <ludo@HIDDEN>
Subject: Re: [bug#70169] [PATCH 6/7] maint: Use reproducible Git timestamp
for POT-Creation-Date.
In-Reply-To: <87jzlexkdr.fsf@HIDDEN> ("Ludovic =?utf-8?Q?Court=C3=A8s=22'?=
=?utf-8?Q?s?= message of "Wed, 03 Apr 2024 22:26:56 +0200")
Organization: AvatarAcademy.nl
References: <cover.1712165977.git.janneke@HIDDEN>
<45e5e23d88c8846551c7493d3e9ab344dcb2f942.1712165977.git.janneke@HIDDEN>
<87jzlexkdr.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
X-Url: http://AvatarAcademy.nl
Date: Thu, 04 Apr 2024 07:12:15 +0200
Message-ID: <87jzldognk.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 70169
Cc: Julien Lepiller <julien@HIDDEN>, 70169 <at> debbugs.gnu.org,
Florian Pelz <pelzflorian@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
Ludovic Court=C3=A8s writes:
> Janneke Nieuwenhuizen <janneke@HIDDEN> skribis:
>
>> + date=3D$$(git log --pretty=3Dformat:%ci -n 1 -- $< 2>/dev/null \
>> + || echo $(SOURCE_DATE_EPOCH)) \
>> + sed -ri -e "s,^(.POT-Creation-Date: )[^\]*,\1$$date," $@-t
>> + mv $@-t $@
>
> Nitpick: I'd use double quotes to avoid bad surprises:
>
> date=3D"$$(git log =E2=80=A6)"
> =E2=80=A6
> mv "$@-t" "$@"
Makes sense, thanks.
guix-patches@HIDDEN:bug#70169; Package guix-patches.
Full text available.Received: (at 70169) by debbugs.gnu.org; 3 Apr 2024 21:28:51 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Wed Apr 03 17:28:50 2024 Received: from localhost ([127.0.0.1]:59825 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rs89z-00006p-Eq for submit <at> debbugs.gnu.org; Wed, 03 Apr 2024 17:28:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39628) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <ludo@HIDDEN>) id 1rs89s-000050-Vd for 70169 <at> debbugs.gnu.org; Wed, 03 Apr 2024 17:28:40 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <ludo@HIDDEN>) id 1rs89i-0006NU-RS; Wed, 03 Apr 2024 17:28:26 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=TqqMO9XP6I6zMaBio/KNxlR/oTtJYJlihAzlxHrFWrw=; b=TjH0IuBzij8wjEgsQPYy RnpvNti45D6oTIgdfz6Fgh/aVUHaNP9k4quMduxF6U26kCfRY4cpGe99JFKZTygyHDxyC+AYfEnUe 6E9kybnRLnNX+uFx5MaxrFGXFS3/xrYF0axbYQJyxJRBV8A2C+J+EAJa+75znggfZbFs+Sg6FALER ROqF0Witjc5l/J+koaPh3TzPGwutcalGUgZ4/gHAqdeieOGX6lGBtR5a8mjGfBvVCm24TBT2yhZi2 umzTU9Lydmrph7RBOxpxQMH1zL3XyMD4WwX+PTZj8ncNLmG4PAjBKeOrp0YGy/nfA03YV+ylOTBAO AJtdJjUU1hdOww==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= <ludo@HIDDEN> To: Janneke Nieuwenhuizen <janneke@HIDDEN> Subject: Re: [bug#70169] [PATCH 0/7] Reproducible `make dist' tarball in defiance of Autotools and Gettext In-Reply-To: <87ttkinooh.fsf@HIDDEN> (Janneke Nieuwenhuizen's message of "Wed, 03 Apr 2024 23:04:14 +0200") References: <cover.1712165977.git.janneke@HIDDEN> <87wmpew4e7.fsf@HIDDEN> <87ttkinooh.fsf@HIDDEN> Date: Wed, 03 Apr 2024 23:28:23 +0200 Message-ID: <87msqaw2yw.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 70169 Cc: 70169 <at> debbugs.gnu.org X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -3.3 (---) Janneke Nieuwenhuizen <janneke@HIDDEN> skribis: > I boldly pushed `origin/wip-tarball', you may try that :) Silly me. =F0=9F=A4=A6 First try: I wasn=E2=80=99t running in a UTF-8 locale (in =E2=80=98guix she= ll -CP=E2=80=99) so I got things like this: --8<---------------cut here---------------start------------->8--- =E2=94=82 =E2=94=9C=E2=94=80=E2=94=80 guix-1.3.0.57425-80a228/AUTHORS =E2=94=82 =E2=94=82 @@ -9,35 +9,35 @@ =E2=94=82 =E2=94=82=20=20 =E2=94=82 =E2=94=82 10255 Ricardo Wurmus <rekado@HIDDEN> =E2=94=82 =E2=94=82 7293 Nicolas Goaziou <mail@HIDDEN> =E2=94=82 =E2=94=82 5991 Efraim Flashner <efraim@HIDDEN> =E2=94=82 =E2=94=82 4033 Maxim Cournoyer <maxim.cournoyer@HIDDEN> =E2=94=82 =E2=94=82 3124 Tobias Geerinckx-Rice <me@HIDDEN> =E2=94=82 =E2=94=82 2356 Marius Bakke <marius@HIDDEN> =E2=94=82 =E2=94=82 - 2306 Ludovic Court??s <ludo@HIDDEN> =E2=94=82 =E2=94=82 + 2306 Ludovic Court=C3=A8s <ludo@HIDDEN> --8<---------------cut here---------------end--------------->8--- Then there=E2=80=99s prolly a timezone issue with the generated ChangeLog: --8<---------------cut here---------------start------------->8--- =E2=94=82 =E2=94=82 -2024-02-19 Troy Figiel <troy@HIDDEN> =E2=94=82 =E2=94=82 +2024-02-20 Troy Figiel <troy@HIDDEN> =E2=94=82 =E2=94=82=20=20 =E2=94=82 =E2=94=82 gnu: Add go-github-com-coocood-freecache. =E2=94=82 =E2=94=82 * gnu/packages/golang-xyz.scm (go-github-com-coocoo= d-freecache): New variable. --8<---------------cut here---------------end--------------->8--- The best thing to do is probably to drop =E2=80=98ChangeLog=E2=80=99 genera= tion (maybe =E2=80=98AUTHORS=E2=80=99 too) and just add a text inviting users to check = the Git log. Then I must have stale =E2=80=98help2man=E2=80=99 byproducts: --8<---------------cut here---------------start------------->8--- =E2=94=82 =E2=94=9C=E2=94=80=E2=94=80 guix-1.3.0.57425-80a228/doc/guix-chal= lenge.1 =E2=94=82 =E2=94=82 @@ -1,11 +1,11 @@ =E2=94=82 =E2=94=82 .\" DO NOT MODIFY THIS FILE! It was generated by help= 2man 1.49.2. =E2=94=82 =E2=94=82 .TH GUIX "1" "April 2024" "GNU" "User Commands" =E2=94=82 =E2=94=82 .SH NAME =E2=94=82 =E2=94=82 -guix \- manual page for guix challenge (GNU Guix) 1.3.= 0.51884-370f8f3 =E2=94=82 =E2=94=82 +guix \- manual page for guix challenge (GNU Guix) 1.3.= 0.57425-80a228 --8<---------------cut here---------------end--------------->8--- Lots of differences in Info files: --8<---------------cut here---------------start------------->8--- =E2=94=82 =E2=94=9C=E2=94=80=E2=94=80 guix-1.3.0.57425-80a228/doc/guix-cook= book.fr.info =E2=94=82 =E2=94=82=E2=94=84 xxd not available in path. Falling back to Pyt= hon hexlify. =E2=94=82 =E2=94=82 @@ -1,6 +1,8216 @@ =E2=94=82 =E2=94=82 5468697320697320677569782d636f6f6b626f6f6b2e66722e696e= 666f2c2070 =E2=94=82 =E2=94=82 726f6475636564206279206d616b65696e666f2076657273696f6e= 20362e3820 =E2=94=82 =E2=94=82 -66726f6d0a677569782d636f6f6b626f6f6b2e66722e746578692e= 0a0a0a1f0a =E2=94=82 =E2=94=82 -546167205461626c653a0a1f0a456e6420546167205461626c650a= 0a1f0a4c6f =E2=94=82 =E2=94=82 -63616c205661726961626c65733a0a636f64696e673a207574662d= 380a456e64 =E2=94=82 =E2=94=82 -3a0a =E2=94=82 =E2=94=82 +66726f6d0a677569782d636f6f6b626f6f6b2e66722e746578692e= 0a0a436f70 =E2=94=82 =E2=94=82 +79726967687420c2a920323031392c203230323220526963617264= 6f20577572 =E2=94=82 =E2=94=82 +6d75730a436f7079726967687420c2a92032303139204566726169= 6d20466c61 =E2=94=82 =E2=94=82 +73686e65720a436f7079726967687420c2a9203230313920506965= 727265204e --8<---------------cut here---------------end--------------->8--- Something with PO files not being regenerated (?): --8<---------------cut here---------------start------------->8--- =E2=94=82 =E2=94=9C=E2=94=80=E2=94=80 guix-1.3.0.57425-80a228/po/packages/e= n@HIDDEN =E2=94=82 =E2=94=82 @@ -1,11 +1,11 @@ =E2=94=82 =E2=94=82 # English translations for guix package. =E2=94=82 =E2=94=82 -# Copyright (C) 2020 the authors of Guix (msgids) =E2=94=82 =E2=94=82 +# Copyright (C) 2024 the authors of Guix (msgids) =E2=94=82 =E2=94=82 # This file is distributed under the same license as t= he guix package. =E2=94=82 =E2=94=82 -# Automatically generated, 2020. =E2=94=82 =E2=94=82 +# Automatically generated, 2024. =E2=94=82 =E2=94=82 # =E2=94=82 =E2=94=82 # All this catalog "translates" are quotation characte= rs. =E2=94=82 =E2=94=82 # The msgids must be ASCII and therefore cannot contai= n real quotation =E2=94=82 =E2=94=82 # characters, only substitutes like grave accent (0x60= ), apostrophe (0x27) =E2=94=82 =E2=94=82 # and double quote (0x22). These substitutes look stra= nge; see =E2=94=82 =E2=94=82 # http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html =E2=94=82 =E2=94=82 # =E2=94=82 =E2=94=82 @@ -26,118 +26,85 @@ =E2=94=82 =E2=94=82 # transliterated to 0x22. =E2=94=82 =E2=94=82 # =E2=94=82 =E2=94=82 # This catalog furthermore displays the text between t= he quotation marks in =E2=94=82 =E2=94=82 # bold face, assuming the VT100/XTerm escape sequences. =E2=94=82 =E2=94=82 # =E2=94=82 =E2=94=82 msgid "" =E2=94=82 =E2=94=82 msgstr "" =E2=94=82 =E2=94=82 -"Project-Id-Version: guix 1.2.0\n" =E2=94=82 =E2=94=82 +"Project-Id-Version: guix 1.3.0.57419-5a2b40\n" =E2=94=82 =E2=94=82 "Report-Msgid-Bugs-To: bug-guix@HIDDEN\n" =E2=94=82 =E2=94=82 -"POT-Creation-Date: 2020-11-22 20:33+0100\n" =E2=94=82 =E2=94=82 -"PO-Revision-Date: 2020-11-22 20:33+0100\n" =E2=94=82 =E2=94=82 +"POT-Creation-Date: 2024-04-03 09:04+0200\n" =E2=94=82 =E2=94=82 +"PO-Revision-Date: 2024-04-03 09:04+0200\n" --8<---------------cut here---------------end--------------->8--- and possibly a timezone issue for POT files: --8<---------------cut here---------------start------------->8--- =E2=94=82 =E2=94=9C=E2=94=80=E2=94=80 guix-1.3.0.57425-80a228/po/packages/g= uix-packages.pot =E2=94=82 =E2=94=82 @@ -4,15 +4,15 @@ =E2=94=82 =E2=94=82 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. =E2=94=82 =E2=94=82 # =E2=94=82 =E2=94=82 #, fuzzy =E2=94=82 =E2=94=82 msgid "" =E2=94=82 =E2=94=82 msgstr "" =E2=94=82 =E2=94=82 "Project-Id-Version: guix 1.3.0.57425-80a228\n" =E2=94=82 =E2=94=82 "Report-Msgid-Bugs-To: bug-guix@HIDDEN\n" =E2=94=82 =E2=94=82 -"POT-Creation-Date: 2024-04-03 21:14+0000\n" =E2=94=82 =E2=94=82 +"POT-Creation-Date: 2024-04-03 20:56+0200\n" =E2=94=82 =E2=94=82 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" --8<---------------cut here---------------end--------------->8--- Note that in =E2=80=98guix shell -CP=E2=80=99 I had no TZ and LC_* variable= set and /etc/timezone is missing. That=E2=80=99s it for today! Ludo=E2=80=99.
guix-patches@HIDDEN:bug#70169; Package guix-patches.
Full text available.
Received: (at 70169) by debbugs.gnu.org; 3 Apr 2024 21:04:37 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Apr 03 17:04:37 2024
Received: from localhost ([127.0.0.1]:59805 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rs7me-0005uy-KS
for submit <at> debbugs.gnu.org; Wed, 03 Apr 2024 17:04:37 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:59686)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <janneke@HIDDEN>) id 1rs7mW-0005tQ-CT
for 70169 <at> debbugs.gnu.org; Wed, 03 Apr 2024 17:04:35 -0400
Received: from fencepost.gnu.org ([2001:470:142:3::e])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <janneke@HIDDEN>)
id 1rs7mL-0001Bd-Tr; Wed, 03 Apr 2024 17:04:17 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To:
From; bh=2t69jdvr1XX2+0KI0mruvsLfusTEznuyXFa+rRpxNbw=; b=EqP+VulgAvd7X5Pivexp
DAx79akS7BhmXm9kx+78o9Sq4nZMaQC8tPY6YBoaWcQloEKabrBLPbjL1WRsK1AD2hAP+TdM/2DKA
w8Jk2cOeHmbLKUXo6N77GjZ4GuyIHCilwHuDswzvMdUFmhK54+x+paTwvWuIezFXidkABjLmQ5VaE
xmXhcP/AKIp30P5dhid8G/nwn89HXgpAapsvkm1ugCH8N9lv6AbCn0AJCe88bS3dt+5qHCmeTZYcT
Pg+NGi3ybiRXYtUy6DZktmc66qHUiH5mt/a/1sbjs9dnUn36DiR3HsfJpZ1+JMvLzqOM7wGKRKNFN
FcLNS9gk9ckNtA==;
From: Janneke Nieuwenhuizen <janneke@HIDDEN>
To: Ludovic =?utf-8?Q?Court=C3=A8s?= <ludo@HIDDEN>
Subject: Re: [bug#70169] [PATCH 0/7] Reproducible `make dist' tarball in
defiance of Autotools and Gettext
In-Reply-To: <87wmpew4e7.fsf@HIDDEN> ("Ludovic =?utf-8?Q?Court=C3=A8s=22'?=
=?utf-8?Q?s?= message of "Wed, 03 Apr 2024 22:57:36 +0200")
Organization: AvatarAcademy.nl
References: <cover.1712165977.git.janneke@HIDDEN> <87wmpew4e7.fsf@HIDDEN>
X-Url: http://AvatarAcademy.nl
Date: Wed, 03 Apr 2024 23:04:14 +0200
Message-ID: <87ttkinooh.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 70169
Cc: 70169 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
Ludovic Court=C3=A8s writes:
Hello,
> Janneke Nieuwenhuizen <janneke@HIDDEN> skribis:
>
>> The recent XZ-utils <https://www.openwall.com/lists/oss-security/2024/03=
/29/4>
>> debacle inspired me to resurrect and finish my patch set for creating a
>> reproducible source tarball for Guix, i.e., finally have `make dist' be
>> reproducible (when run from Git). I've been using a version of these pa=
tches
>> in simpler projects for some years now and stole one from Timothy Sample=
t's
>> Gash project.
>
> Yay, kudos to you and Timothy!
\o/
>> Autotools and Gettext still make it harder than necessary to do reproduc=
ible
>> (responsible?) computing, which is especially sad given the fact that the
>> Reproducible Builds project recently had their 10th birthday
>> <https://reproducible-builds.org/_lfs/presentations/2023-05-27-R-B-the-f=
irst-10-years/#/>.
>>
>> Gettext tooling embeds timestamps found in the file-system, fails to res=
pect
>> SOURCE_DATE_EPOCH, and lacks options like `--pot-creation-date' so that =
we
>> have to resort to SED to fixup. The caching of all sorts of information=
, in
>> separate build stages, also doesn't help.
>
> Sadness indeed. Hopefully things will improve in the coming weeks, now
> that there=E2=80=99s an impetus.
Yes, that would be nice. With more people joining the effort, it could
be fixed brilliantly, in no time :)
>> To create a reproducible source tarball, having a reproducible build
>> environment is a prerequitite, so this would have to be recorded too.
>> Using this patch set, I created a tarball doing something like
>>
>> guix pull --commit=3D1dbe492b993a7629df3b35146ce0272b52913776
>> guix shell
>> bootstrap && ./configure --localstatedir=3D/var --sysconfdir=3D/etc && m=
ake dist
>> guix hash guix-1.3.0.57425-80a228.tar.gz
>> 0mk59ay5k2dxmjni9fx4i8qyfhvlgxbhqzsjpg2pbw381nskkxbj
>
> I applied the whole series on top of
> df64d48e6f9f648044aa5279c045b8d6f7bee604 (the =E2=80=98base-commit=E2=80=
=99 at the
> bottom of your message). Thus I got the same content as you but with a
> different commit ID.
Yeah..., that's why I pushed `wip-tarball'. We even look at the
committer's timestamp (not author, as that could be quite old).
> =E2=80=9Cmake dist=E2=80=9D gave me guix-1.3.0.57425-9f4a4a.tar.gz. The =
name indeed
> corresponds to the tip of my tree:
[..]
> But as a result, I get a different hash, and since the directory in the
> tarball has a different name, =E2=80=98diffoscope=E2=80=99 isn=E2=80=99t =
very helpful.
>
> There=E2=80=99s at least one relevant difference in the gzip metadata:
>
> --- guix-1.3.0.57425-9f4a4a.tar.gz
> +++ /tmp/guix-1.3.0.57425-80a228.tar.gz
> =E2=94=9C=E2=94=80=E2=94=80 filetype from file(1)
> =E2=94=82 @@ -1 +1 @@
> =E2=94=82 -gzip compressed data, from Unix, original size modulo 2^32 208=
138240 gzip compressed data, rese
> rved method, ASCII, extra field, encrypted, from FAT filesystem (MS-DOS, =
OS/2, NT)
> =E2=94=82 +gzip compressed data, from Unix, original size modulo 2^32 222=
504960 gzip compressed data, rese
> rved method, ASCII, has CRC, was "", has comment, encrypted, from FAT fil=
esystem (MS-DOS, OS/2, NT
>
>
> (Your tarball has a CRC and comment, mine doesn=E2=80=99t.)
I believe this is a red herring. I saw this all day whenever one file
had a difference...
> Maybe we=E2=80=99ll have to iterate once you=E2=80=99ve pushed a first ve=
rsion, so we
> can truly build the same thing. Or we should push the branch somewhere
I boldly pushed `origin/wip-tarball', you may try that :)
Be sure to git diff between your tip and origin/wip-tarball to ascertain
I didn't place easter eggs (just kidding).
> (or use the one from <https://data.qa.guix.gnu.org/> once it=E2=80=99s be=
en
> created).
Thanks a lot for trying!
Greetings,
Janneke
guix-patches@HIDDEN:bug#70169; Package guix-patches.
Full text available.
Received: (at 70169) by debbugs.gnu.org; 3 Apr 2024 20:58:00 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Apr 03 16:58:00 2024
Received: from localhost ([127.0.0.1]:59800 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rs7gD-0005G1-Ro
for submit <at> debbugs.gnu.org; Wed, 03 Apr 2024 16:58:00 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:39690)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <ludo@HIDDEN>) id 1rs7g8-0005Ej-RM
for 70169 <at> debbugs.gnu.org; Wed, 03 Apr 2024 16:57:56 -0400
Received: from fencepost.gnu.org ([2001:470:142:3::e])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <ludo@HIDDEN>)
id 1rs7fw-0005Kf-9S; Wed, 03 Apr 2024 16:57:41 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To:
From; bh=fJJ1MSwOXc/nlXX72ErvAQ07W3rIihJ2KP5rXpG62ak=; b=m2ERkBYQuMxNfQyfe6uM
fOwueb0HVEr1ASqF+7OLQfgUFibAQIZrlRjmuAfgCPe/C4lVTLX4ngPI2t6Z6pqg/ToGtI1kKQChk
mhUi8IHwSZQ1rowQTu9xAw98/iLM/UEf3tsRwGlqGpxreVelffHkDPP26iAZdFLTj/tu3yqhsAhz7
Wn7Eo0Zz5ryxFf2rlI/6kIvfXTcFD0zATOCyTs7O0tHM3Wxw4Q52MjyktUZH8YIGgP9M31jySxWQn
NGo424kBAc+vdeWReubM8iESxiVwboVvFGHOL3N32FLR8kDJZFt6artZoj4gteGGEOI1dfvrsCogz
ycGpF6AG1VX9JA==;
From: =?utf-8?Q?Ludovic_Court=C3=A8s?= <ludo@HIDDEN>
To: Janneke Nieuwenhuizen <janneke@HIDDEN>
Subject: Re: [bug#70169] [PATCH 0/7] Reproducible `make dist' tarball in
defiance of Autotools and Gettext
In-Reply-To: <cover.1712165977.git.janneke@HIDDEN> (Janneke Nieuwenhuizen's
message of "Wed, 3 Apr 2024 21:08:40 +0200")
References: <cover.1712165977.git.janneke@HIDDEN>
Date: Wed, 03 Apr 2024 22:57:36 +0200
Message-ID: <87wmpew4e7.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 70169
Cc: 70169 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
Hi!
Janneke Nieuwenhuizen <janneke@HIDDEN> skribis:
> The recent XZ-utils <https://www.openwall.com/lists/oss-security/2024/03/=
29/4>
> debacle inspired me to resurrect and finish my patch set for creating a
> reproducible source tarball for Guix, i.e., finally have `make dist' be
> reproducible (when run from Git). I've been using a version of these pat=
ches
> in simpler projects for some years now and stole one from Timothy Samplet=
's
> Gash project.
Yay, kudos to you and Timothy!
> Autotools and Gettext still make it harder than necessary to do reproduci=
ble
> (responsible?) computing, which is especially sad given the fact that the
> Reproducible Builds project recently had their 10th birthday
> <https://reproducible-builds.org/_lfs/presentations/2023-05-27-R-B-the-fi=
rst-10-years/#/>.
>
> Gettext tooling embeds timestamps found in the file-system, fails to resp=
ect
> SOURCE_DATE_EPOCH, and lacks options like `--pot-creation-date' so that we
> have to resort to SED to fixup. The caching of all sorts of information,=
in
> separate build stages, also doesn't help.
Sadness indeed. Hopefully things will improve in the coming weeks, now
that there=E2=80=99s an impetus.
> To create a reproducible source tarball, having a reproducible build
> environment is a prerequitite, so this would have to be recorded too.
> Using this patch set, I created a tarball doing something like
>
> guix pull --commit=3D1dbe492b993a7629df3b35146ce0272b52913776
> guix shell
> bootstrap && ./configure --localstatedir=3D/var --sysconfdir=3D/etc && ma=
ke dist
> guix hash guix-1.3.0.57425-80a228.tar.gz
> 0mk59ay5k2dxmjni9fx4i8qyfhvlgxbhqzsjpg2pbw381nskkxbj
I applied the whole series on top of
df64d48e6f9f648044aa5279c045b8d6f7bee604 (the =E2=80=98base-commit=E2=80=99=
at the
bottom of your message). Thus I got the same content as you but with a
different commit ID.
=E2=80=9Cmake dist=E2=80=9D gave me guix-1.3.0.57425-9f4a4a.tar.gz. The na=
me indeed
corresponds to the tip of my tree:
--8<---------------cut here---------------start------------->8---
$ guix hash guix-1.3.0.57425-9f4a4a.tar.gz
0z3c4f8g6rsi9n0j8cwzwvw4bc59srg6bl3jj8yi60hbr9vrz5ql
$ git log |head
commit 9f4a4adfa778b281b794b61014e06dad98b6c945
Author: Janneke Nieuwenhuizen <janneke@HIDDEN>
Date: Wed Apr 3 21:11:09 2024 +0200
maint: Ensure generated file reproducibility for dist.
=20=20=20=20
* doc/local.mk (override $(srcdir)/doc/stamp-vti): New target override.
(doc-clean, man-clean): New targets.
(auto-clean): Depend on it in new target.
(DIST_CONFIGURE_FLAGS): New variable.
--8<---------------cut here---------------end--------------->8---
But as a result, I get a different hash, and since the directory in the
tarball has a different name, =E2=80=98diffoscope=E2=80=99 isn=E2=80=99t ve=
ry helpful.
There=E2=80=99s at least one relevant difference in the gzip metadata:
--8<---------------cut here---------------start------------->8---
--- guix-1.3.0.57425-9f4a4a.tar.gz
+++ /tmp/guix-1.3.0.57425-80a228.tar.gz
=E2=94=9C=E2=94=80=E2=94=80 filetype from file(1)
=E2=94=82 @@ -1 +1 @@
=E2=94=82 -gzip compressed data, from Unix, original size modulo 2^32 20813=
8240 gzip compressed data, rese
rved method, ASCII, extra field, encrypted, from FAT filesystem (MS-DOS, OS=
/2, NT)
=E2=94=82 +gzip compressed data, from Unix, original size modulo 2^32 22250=
4960 gzip compressed data, rese
rved method, ASCII, has CRC, was "", has comment, encrypted, from FAT files=
ystem (MS-DOS, OS/2, NT
--8<---------------cut here---------------end--------------->8---
(Your tarball has a CRC and comment, mine doesn=E2=80=99t.)
Maybe we=E2=80=99ll have to iterate once you=E2=80=99ve pushed a first vers=
ion, so we
can truly build the same thing. Or we should push the branch somewhere
(or use the one from <https://data.qa.guix.gnu.org/> once it=E2=80=99s been
created).
Thanks!
Ludo=E2=80=99.
guix-patches@HIDDEN:bug#70169; Package guix-patches.
Full text available.
Received: (at 70169) by debbugs.gnu.org; 3 Apr 2024 20:49:28 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Apr 03 16:49:28 2024
Received: from localhost ([127.0.0.1]:59795 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rs7Xz-0004TS-Qk
for submit <at> debbugs.gnu.org; Wed, 03 Apr 2024 16:49:28 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:54130)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <janneke@HIDDEN>) id 1rs7Xx-0004Sn-MC
for 70169 <at> debbugs.gnu.org; Wed, 03 Apr 2024 16:49:26 -0400
Received: from fencepost.gnu.org ([2001:470:142:3::e])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <janneke@HIDDEN>)
id 1rs7Xn-0002kJ-NI; Wed, 03 Apr 2024 16:49:15 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To:
From; bh=54RUrAfiK7u1gBoxXk2fFEm5KBlqQ3DvbWU4BL4bLmk=; b=YCpkwQM+DLkTvhnvtUM8
dTNuOAQeLZNovM5u7W7GwlugGnAp8QQ8W3UnNsIrJPMC3de2kqoJ9OpjI4Kf1Dlq4YB1eC2+u77BE
ZlIwVhiEYL7YnZbYy2IoOvHCB28ldVTUcaiGAh8PBjsis5KHgmFOmEK2+BIeIuhot7LiRdbiiAS7h
Hp+8U4QA7Gl9NSH1yrXskl9EhCNw7S5KDAeW0W1osas9FMhH0j3UsIAHR3T16qKLwcqtRQYrweaAn
3fIVrzMbYh6fr53hiXLNLZWCVSm3H8RKknq1fcyerD74XZiCzCUe6NRau5YBrS87ZIgfonfsBThaB
NZN4msiwtsZ0pw==;
From: Janneke Nieuwenhuizen <janneke@HIDDEN>
To: Ludovic =?utf-8?Q?Court=C3=A8s?= <ludo@HIDDEN>
Subject: Re: [bug#70169] [PATCH 2/7] maint: Use reproducible timestamps and
name for tarball.
In-Reply-To: <875xwyxjje.fsf@HIDDEN> ("Ludovic =?utf-8?Q?Court=C3=A8s=22'?=
=?utf-8?Q?s?= message of "Wed, 03 Apr 2024 22:45:09 +0200")
Organization: AvatarAcademy.nl
References: <cover.1712165977.git.janneke@HIDDEN>
<05e6677d56a3a23ae8526cc56c14c7de33a8254a.1712165977.git.janneke@HIDDEN>
<875xwyxjje.fsf@HIDDEN>
X-Url: http://AvatarAcademy.nl
Date: Wed, 03 Apr 2024 22:49:12 +0200
Message-ID: <87zfuanpdj.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 70169
Cc: 70169 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
Ludovic Court=C3=A8s writes:
> Janneke Nieuwenhuizen <janneke@HIDDEN> skribis:
>
>> +# Reproducible tarball
>> +GZIP_ENV =3D --no-name
Hmm, should we add `--best' here too?
> Looks like Automake can feel the defiance:
>
> Makefile.am:1007: warning: user variable 'GZIP_ENV' defined here ...
> /gnu/store/lynhxxaygrbw0z05bwsc5c3i5r5qdv38-automake-1.16.5/share/automak=
e-1.16/am/distdir.am: ... overrides Automake variable 'GZIP_ENV' defined he=
re
>
> Probably nothing to worry about, though IWBN if we could silence it.
Yes, indeed... (Help! :)
Janneke
guix-patches@HIDDEN:bug#70169; Package guix-patches.
Full text available.Received: (at 70169) by debbugs.gnu.org; 3 Apr 2024 20:45:30 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Wed Apr 03 16:45:29 2024 Received: from localhost ([127.0.0.1]:59785 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rs7U9-00042Q-JB for submit <at> debbugs.gnu.org; Wed, 03 Apr 2024 16:45:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41374) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <ludo@HIDDEN>) id 1rs7U7-00041c-Bp for 70169 <at> debbugs.gnu.org; Wed, 03 Apr 2024 16:45:28 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <ludo@HIDDEN>) id 1rs7Tx-0000Zm-27; Wed, 03 Apr 2024 16:45:17 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=ELfOHxcFljraow2DF7xYiopV8lExn+VoX6kYLo+7c1g=; b=MG1Jn7qyeZjMnFggw7+f +jNMsETzxhVvostJhX/WVKum/rHhNtX/2zB5YUm5SL98oP2eo068rXyAtjRLajqQwPYA+W+QKiYf+ eF1p3qYrI8acCv7iGwou3t0UHsw//l4dfMyAO/WZsgiAFnbLVYnOLG89xIZqoKK51Q/VFWyhZehMG XMLY9d5WF5wsIyP6pNBUXR2Q2ppa+qeEVGfiCmcbl1E+bO6tPBNZXXzavNC2MeKtaG0oT7db0H9Bh sWYLI6CQaWDtPmuoQS7D2+2SrXj/VVJzApHxmHPXgJjZdXqyl881iuEbaYXx++Bs6e16H17gSOK4f VVCZccdrflf4rw==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= <ludo@HIDDEN> To: Janneke Nieuwenhuizen <janneke@HIDDEN> Subject: Re: [bug#70169] [PATCH 2/7] maint: Use reproducible timestamps and name for tarball. In-Reply-To: <05e6677d56a3a23ae8526cc56c14c7de33a8254a.1712165977.git.janneke@HIDDEN> (Janneke Nieuwenhuizen's message of "Wed, 3 Apr 2024 21:11:04 +0200") References: <cover.1712165977.git.janneke@HIDDEN> <05e6677d56a3a23ae8526cc56c14c7de33a8254a.1712165977.git.janneke@HIDDEN> Date: Wed, 03 Apr 2024 22:45:09 +0200 Message-ID: <875xwyxjje.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 70169 Cc: 70169 <at> debbugs.gnu.org X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -3.3 (---) Janneke Nieuwenhuizen <janneke@HIDDEN> skribis: > +# Reproducible tarball > +GZIP_ENV =3D --no-name Looks like Automake can feel the defiance: --8<---------------cut here---------------start------------->8--- Makefile.am:1007: warning: user variable 'GZIP_ENV' defined here ... /gnu/store/lynhxxaygrbw0z05bwsc5c3i5r5qdv38-automake-1.16.5/share/automake-= 1.16/am/distdir.am: ... overrides Automake variable 'GZIP_ENV' defined here --8<---------------cut here---------------end--------------->8--- Probably nothing to worry about, though IWBN if we could silence it. Ludo=E2=80=99.
guix-patches@HIDDEN:bug#70169; Package guix-patches.
Full text available.
Received: (at 70169) by debbugs.gnu.org; 3 Apr 2024 20:43:36 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Apr 03 16:43:36 2024
Received: from localhost ([127.0.0.1]:59780 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rs7SJ-0003rb-Vs
for submit <at> debbugs.gnu.org; Wed, 03 Apr 2024 16:43:36 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:51100)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <janneke@HIDDEN>) id 1rs7SH-0003qj-4h
for 70169 <at> debbugs.gnu.org; Wed, 03 Apr 2024 16:43:34 -0400
Received: from fencepost.gnu.org ([2001:470:142:3::e])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <janneke@HIDDEN>)
id 1rs7S4-0005gq-VR; Wed, 03 Apr 2024 16:43:22 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To:
From; bh=t2YI071NdS+lR1yu6iCcfA921+JUh38VfPPiRBBvF80=; b=QLK7g38kAtepr46/06Fy
OskiXxe+1OAs8NI1wJqxPpb6Z6xg0uJLyxgbuSx3Lmrca8HrSugZdNKletdbuXa2R+e7O/589ej7s
l++UuUKMgn02XIdT5tzbKqu4IsnOnGNGaObQEM4llrhqGd+I9YqDyhWhWqn6DaDLIAakzMiPEZ6zJ
GNIBdT1pWyiRohuFIMyjKpF6spn/ILOinDsrpUXi74mw8VvexZoWaeYodo8JKKKFffJ1FxE5IhBIk
8Ahn+u3dUFsKu33lxwtJnlsdGXBh5xjWUkBsUmzB2+kMh381ljtHerrpeSWf+J0WeRLxyfW2W/s4W
i6YkpzWDKtAUQg==;
From: Janneke Nieuwenhuizen <janneke@HIDDEN>
To: Ludovic =?utf-8?Q?Court=C3=A8s?= <ludo@HIDDEN>
Subject: Re: [bug#70169] [PATCH 5/7] maint: Generate 'doc/version-LANG.texi'
reproducibly.
In-Reply-To: <87a5maxjt3.fsf@HIDDEN> ("Ludovic =?utf-8?Q?Court=C3=A8s=22'?=
=?utf-8?Q?s?= message of "Wed, 03 Apr 2024 22:39:20 +0200")
Organization: AvatarAcademy.nl
References: <cover.1712165977.git.janneke@HIDDEN>
<947bed93d2e2fec221fdec0d247f61912fb89567.1712165977.git.janneke@HIDDEN>
<87a5maxjt3.fsf@HIDDEN>
X-Url: http://AvatarAcademy.nl
Date: Wed, 03 Apr 2024 22:43:08 +0200
Message-ID: <875xwyp483.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 70169
Cc: Timothy Sample <samplet@HIDDEN>, 70169 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
Ludovic Court=C3=A8s writes:
[cc: Timothy Samplet who created an early version of this patch]
> Janneke Nieuwenhuizen <janneke@HIDDEN> skribis:
>
>> * doc/local.mk ($(srcdir)/doc/stamp-vti): Change rule into...
>> (version.texi-from-git): ...this new function. Call it with vti,guix.te=
xi,;
>> and for all MANUAL_LANGUAGES with $(i),po/doc/guix-manual.$(lang).po,
>> -$(lang.po).
>>
>> Change-Id: Ia8df618178066cad320eecea0299337224e23a73
>
> [...]
>
>> +i:=3D0
>> +$(eval $(call version.texi-from-git,vti,doc/guix.texi,))
>> +$(foreach lang, $(MANUAL_LANGUAGES), \
>> + $(eval i=3D$(shell echo $$(($(i)+1)))) \
>> + $(eval $(call version.texi-from-git,$(i),po/doc/guix-manual.$(lang).po=
,-$(lang))))
>
> Also, not sure why but I get this:
>
> make[2]: Entering directory '/home/ludo/src/guix'
> Makefile:7389: warning: overriding recipe for target 'doc/stamp-vti'
> Makefile:5111: warning: ignoring old recipe for target 'doc/stamp-vti'
> Makefile:7390: warning: overriding recipe for target 'override'
> Makefile:7389: warning: ignoring old recipe for target 'override'
> Makefile:7390: warning: overriding recipe for target 'doc/stamp-1'
> Makefile:5176: warning: ignoring old recipe for target 'doc/stamp-1'
> [=E2=80=A6]
Yes, sadly that's expected, and couldn't figure out how to avoid this.
Any ideas would be greatly appreciated. Automake will just create those
targets, and it seems we must override exactly those. May Timothy has
an idea?
guix-patches@HIDDEN:bug#70169; Package guix-patches.
Full text available.Received: (at 70169) by debbugs.gnu.org; 3 Apr 2024 20:39:38 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Wed Apr 03 16:39:38 2024 Received: from localhost ([127.0.0.1]:59775 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rs7OU-0003WO-91 for submit <at> debbugs.gnu.org; Wed, 03 Apr 2024 16:39:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35548) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <ludo@HIDDEN>) id 1rs7OR-0003VU-AQ for 70169 <at> debbugs.gnu.org; Wed, 03 Apr 2024 16:39:36 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <ludo@HIDDEN>) id 1rs7OG-0004tt-0M; Wed, 03 Apr 2024 16:39:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=Paj5Z8v8Ygo/zdCYsmUV0zmUlGL9eamr7KiP1KQUCy8=; b=lopd/co3Mk9l8Qbk2MbP lwkT72MzvOuzhqoFXMZTjLgpvdr62BRYazjlttV1xtC/WLI+uetp+7Z6NxFyvaoDK0olNYm4sA+Xs u2iluEf3P4aWDT3W5dS2t37GomhkfSnj9gjwMt3IcbgyeMKht/43AP7UgaqWLfKrSD8Kyj7AyLbji muA6EG2VDAZlHKqYXBxP9PHxEQ6/nYmuPJaeUvrSDyU6FA8fAxxI98nPsGU/cNrc9V7FW8R8rWeRU uaEyk7/gy2CNhzYXrJzHE4OfBLqzaECsYzdRfVzYWl5+k4zlCu4jc7XnnuXVsuVWwF2kiTEex8upD l/YvLfGlNU6krg==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= <ludo@HIDDEN> To: Janneke Nieuwenhuizen <janneke@HIDDEN> Subject: Re: [bug#70169] [PATCH 5/7] maint: Generate 'doc/version-LANG.texi' reproducibly. In-Reply-To: <947bed93d2e2fec221fdec0d247f61912fb89567.1712165977.git.janneke@HIDDEN> (Janneke Nieuwenhuizen's message of "Wed, 3 Apr 2024 21:11:07 +0200") References: <cover.1712165977.git.janneke@HIDDEN> <947bed93d2e2fec221fdec0d247f61912fb89567.1712165977.git.janneke@HIDDEN> Date: Wed, 03 Apr 2024 22:39:20 +0200 Message-ID: <87a5maxjt3.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 70169 Cc: 70169 <at> debbugs.gnu.org X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -3.3 (---) Janneke Nieuwenhuizen <janneke@HIDDEN> skribis: > * doc/local.mk ($(srcdir)/doc/stamp-vti): Change rule into... > (version.texi-from-git): ...this new function. Call it with vti,guix.tex= i,; > and for all MANUAL_LANGUAGES with $(i),po/doc/guix-manual.$(lang).po, > -$(lang.po). > > Change-Id: Ia8df618178066cad320eecea0299337224e23a73 [...] > +i:=3D0 > +$(eval $(call version.texi-from-git,vti,doc/guix.texi,)) > +$(foreach lang, $(MANUAL_LANGUAGES), \ > + $(eval i=3D$(shell echo $$(($(i)+1)))) \ > + $(eval $(call version.texi-from-git,$(i),po/doc/guix-manual.$(lang).po,= -$(lang)))) Also, not sure why but I get this: --8<---------------cut here---------------start------------->8--- make[2]: Entering directory '/home/ludo/src/guix' Makefile:7389: warning: overriding recipe for target 'doc/stamp-vti' Makefile:5111: warning: ignoring old recipe for target 'doc/stamp-vti' Makefile:7390: warning: overriding recipe for target 'override' Makefile:7389: warning: ignoring old recipe for target 'override' Makefile:7390: warning: overriding recipe for target 'doc/stamp-1' Makefile:5176: warning: ignoring old recipe for target 'doc/stamp-1' [=E2=80=A6] --8<---------------cut here---------------end--------------->8--- Ludo=E2=80=99.
guix-patches@HIDDEN:bug#70169; Package guix-patches.
Full text available.
Received: (at 70169) by debbugs.gnu.org; 3 Apr 2024 20:36:48 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Apr 03 16:36:48 2024
Received: from localhost ([127.0.0.1]:59769 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rs7Lj-0003Fz-3O
for submit <at> debbugs.gnu.org; Wed, 03 Apr 2024 16:36:48 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:48820)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <janneke@HIDDEN>) id 1rs7Lg-0003FP-NX
for 70169 <at> debbugs.gnu.org; Wed, 03 Apr 2024 16:36:45 -0400
Received: from fencepost.gnu.org ([2001:470:142:3::e])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <janneke@HIDDEN>)
id 1rs7LU-0004Um-Ut; Wed, 03 Apr 2024 16:36:33 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To:
From; bh=GY5gwDx5DJ9T7OYv41YtQRrJ5AP/oWiFqkIZxcdL7bg=; b=eJoR0JJpEavEv9bi0EEA
wZSQhzAmpXsRjkNVzkU0smGpWNTow2UVaAkv4obQxC1reykLjd93+e1wgNv3IIFsqjcq+12doWny2
4gr9Y0YdxfnWBmeCZNLeGX0DrsjPtGcI1h/iui6pZnedhJDDLjImHLSU4i/QFWT7e6C25RV9bT4AH
L17YdaQ2ux6SsoycIlCjeC8yRhXrzgMbrJThX1Zilywo6xzCKfZPdowFmwO4wxm2DbLOX23VVzS5J
J7CTBnCWohopljPppfdbXsDlSku9B5/5iSuPT6wD6vg3Im+VZTdGfC2+URqSJiskm0G4R232QW0td
HErO0oZD2AWQ+w==;
From: Janneke Nieuwenhuizen <janneke@HIDDEN>
To: Ludovic =?utf-8?Q?Court=C3=A8s?= <ludo@HIDDEN>
Subject: Re: [bug#70169] [PATCH 6/7] maint: Use reproducible Git timestamp
for POT-Creation-Date.
In-Reply-To: <87jzlexkdr.fsf@HIDDEN> ("Ludovic =?utf-8?Q?Court=C3=A8s=22'?=
=?utf-8?Q?s?= message of "Wed, 03 Apr 2024 22:26:56 +0200")
Organization: AvatarAcademy.nl
References: <cover.1712165977.git.janneke@HIDDEN>
<45e5e23d88c8846551c7493d3e9ab344dcb2f942.1712165977.git.janneke@HIDDEN>
<87jzlexkdr.fsf@HIDDEN>
X-Url: http://AvatarAcademy.nl
Date: Wed, 03 Apr 2024 22:36:21 +0200
Message-ID: <87bk6qp4je.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 70169
Cc: Julien Lepiller <julien@HIDDEN>, 70169 <at> debbugs.gnu.org,
Florian Pelz <pelzflorian@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
Ludovic Court=C3=A8s writes:
> Janneke Nieuwenhuizen <janneke@HIDDEN> skribis:
>
>> + date=3D$$(git log --pretty=3Dformat:%ci -n 1 -- $< 2>/dev/null \
>> + || echo $(SOURCE_DATE_EPOCH)) \
>> + sed -ri -e "s,^(.POT-Creation-Date: )[^\]*,\1$$date," $@-t
>> + mv $@-t $@
>
> Nitpick: I'd use double quotes to avoid bad surprises:
>
> date=3D"$$(git log =E2=80=A6)"
> =E2=80=A6
> mv "$@-t" "$@"
Makes sense, thanks.
guix-patches@HIDDEN:bug#70169; Package guix-patches.
Full text available.
Received: (at 70169) by debbugs.gnu.org; 3 Apr 2024 20:33:20 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Apr 03 16:33:19 2024
Received: from localhost ([127.0.0.1]:59764 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rs7IM-0002wu-H4
for submit <at> debbugs.gnu.org; Wed, 03 Apr 2024 16:33:19 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:56788)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <janneke@HIDDEN>) id 1rs7IJ-0002wQ-I1
for 70169 <at> debbugs.gnu.org; Wed, 03 Apr 2024 16:33:16 -0400
Received: from fencepost.gnu.org ([2001:470:142:3::e])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <janneke@HIDDEN>)
id 1rs7I8-00028N-U2; Wed, 03 Apr 2024 16:33:04 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To:
From; bh=bTBRSigKt604BHP/JhPyjh7c2eh5s03DgXW4BqjMAes=; b=CCNPAAuTc17v2ojgP5vP
/pFB9K2GV8bPAogCKj+K1M0+mFRghBBAdmhgkGafcX/Jj3rvnsyChd/5FETtT39xk5hsjiF9pPClf
v+MrGJDaIx4xfZhclsSge9/2riuTmuoCkwwAl1209El4HLNmmrOQ9MYNSJpyHtTveRzW0XDtGkztW
XraWquuC2yvrCLGi08dIENLWmLlohU/zT0D8Jookqg5t83FpLlHOC3GTyJ+wyA0P6CFsZuEmS0+l/
OQeWJaqLm4LaAXLj6XNnbidakFpZyrrpzcm7ySkXUldWdcTDtMRTWmyeWJuJ8qSbcja/xwuJo3pwZ
UMpWyCDzdbdSTw==;
From: Janneke Nieuwenhuizen <janneke@HIDDEN>
To: Ludovic =?utf-8?Q?Court=C3=A8s?= <ludo@HIDDEN>
Subject: Re: [bug#70169] [PATCH 5/7] maint: Generate 'doc/version-LANG.texi'
reproducibly.
In-Reply-To: <87o7aqxkgw.fsf@HIDDEN> ("Ludovic =?utf-8?Q?Court=C3=A8s=22'?=
=?utf-8?Q?s?= message of "Wed, 03 Apr 2024 22:25:03 +0200")
Organization: AvatarAcademy.nl
References: <cover.1712165977.git.janneke@HIDDEN>
<947bed93d2e2fec221fdec0d247f61912fb89567.1712165977.git.janneke@HIDDEN>
<87o7aqxkgw.fsf@HIDDEN>
X-Url: http://AvatarAcademy.nl
Date: Wed, 03 Apr 2024 22:33:00 +0200
Message-ID: <87frw2p4oz.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 70169
Cc: 70169 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
Ludovic Court=C3=A8s writes:
> Janneke Nieuwenhuizen <janneke@HIDDEN> skribis:
>
>> +$(eval $(call version.texi-from-git,vti,doc/guix.texi,))
>> +$(foreach lang, $(MANUAL_LANGUAGES), \
>> + $(eval i=3D$(shell echo $$(($(i)+1)))) \
>> + $(eval $(call version.texi-from-git,$(i),po/doc/guix-manual.$(lang).po=
,-$(lang))))
>
> Maybe we could drop =E2=80=98i=E2=80=99 and instead create =E2=80=98samp-=
fr=E2=80=99, =E2=80=98stamp-de=E2=80=99, and so
> on? That is, =E2=80=98version.texi-from-git=E2=80=99 would take 2 argume=
nts instead of 3.
I don't think so, or, I wouldn't know how to do that. The stamp-N is
created by Automake's magic. They are distributed together with the
version-LANG.texi files.
If Automake would have used stamp-LANG, this would have been much
easier, we could probably have used stem (%) instead of this hairy
function.
> (That=E2=80=99s really a minor issue though.)
Ok, but if it's somehow possible, I agree it would be nice.
Greetings,
Janneke
--=20
Janneke Nieuwenhuizen <janneke@HIDDEN> | GNU LilyPond https://LilyPond.org
Freelance IT https://www.JoyOfSource.com | Avatar=C2=AE https://AvatarAcade=
my.com
guix-patches@HIDDEN:bug#70169; Package guix-patches.
Full text available.Received: (at 70169) by debbugs.gnu.org; 3 Apr 2024 20:27:13 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Wed Apr 03 16:27:13 2024 Received: from localhost ([127.0.0.1]:59758 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rs7CS-0002W6-Mv for submit <at> debbugs.gnu.org; Wed, 03 Apr 2024 16:27:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60744) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <ludo@HIDDEN>) id 1rs7CQ-0002Vt-SP for 70169 <at> debbugs.gnu.org; Wed, 03 Apr 2024 16:27:11 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <ludo@HIDDEN>) id 1rs7CE-0006wV-La; Wed, 03 Apr 2024 16:26:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=wKDyPue3GhLcSoHhk2im+FuqBQ7lMyPl78iNDfdU24Q=; b=FkEa+7xvyA9eFdMBBG5g VB7DYY2A1vNgESIafgLsOmSOxQN328C4NAbCyxwoU4Hie3YAfB/urpgWeo3QMza7Dnabkt7652kyQ /1aonV2+sjNx/3uPW8Um8nzvloE0+6e+usnXjB0LuC/7nPnzgQj0V7iVpIX7jpQiYI8kcs/ka2QZu SKgaIFgJdydB2ahBefSxdlsHENQ90CFKHZ1bgPPpaJ9S14jg6nZq11vHU7rZxxGvG6F8DYPrPXgbz lMPNnPaE5QeAj1WDgPl9USzcxh6LToYrSasD80ZjL3XxScKf7vRmX7c/4UQceBGExS7Y7fJVaDUST cW15M/4mumSNjw==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= <ludo@HIDDEN> To: Janneke Nieuwenhuizen <janneke@HIDDEN> Subject: Re: [bug#70169] [PATCH 6/7] maint: Use reproducible Git timestamp for POT-Creation-Date. In-Reply-To: <45e5e23d88c8846551c7493d3e9ab344dcb2f942.1712165977.git.janneke@HIDDEN> (Janneke Nieuwenhuizen's message of "Wed, 3 Apr 2024 21:11:08 +0200") References: <cover.1712165977.git.janneke@HIDDEN> <45e5e23d88c8846551c7493d3e9ab344dcb2f942.1712165977.git.janneke@HIDDEN> Date: Wed, 03 Apr 2024 22:26:56 +0200 Message-ID: <87jzlexkdr.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 70169 Cc: Julien Lepiller <julien@HIDDEN>, 70169 <at> debbugs.gnu.org, Florian Pelz <pelzflorian@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -3.3 (---) Janneke Nieuwenhuizen <janneke@HIDDEN> skribis: > + date=3D$$(git log --pretty=3Dformat:%ci -n 1 -- $< 2>/dev/null \ > + || echo $(SOURCE_DATE_EPOCH)) \ > + sed -ri -e "s,^(.POT-Creation-Date: )[^\]*,\1$$date," $@-t > + mv $@-t $@ Nitpick: I'd use double quotes to avoid bad surprises: date=3D"$$(git log =E2=80=A6)" =E2=80=A6 mv "$@-t" "$@"
guix-patches@HIDDEN:bug#70169; Package guix-patches.
Full text available.
Received: (at 70169) by debbugs.gnu.org; 3 Apr 2024 20:25:23 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Apr 03 16:25:23 2024
Received: from localhost ([127.0.0.1]:59753 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rs7Ah-0002QA-5h
for submit <at> debbugs.gnu.org; Wed, 03 Apr 2024 16:25:23 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:43444)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <ludo@HIDDEN>) id 1rs7Ae-0002Pw-Og
for 70169 <at> debbugs.gnu.org; Wed, 03 Apr 2024 16:25:22 -0400
Received: from fencepost.gnu.org ([2001:470:142:3::e])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <ludo@HIDDEN>)
id 1rs7AT-0006bP-4c; Wed, 03 Apr 2024 16:25:09 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To:
From; bh=aUwF3bO2KHKU5KKCTyn0YdZ1RIlG0NPemBAuRfozsjE=; b=BttXkPTeoXMVxE3Dy5yI
w3fVy6G+HPPuqhbrvwU+JlPve0ThL+MDrDEsz4nSmAXKs/DpTQltvPMLfa12mJJOms+YQjRwrKTQ5
zNYCNH+VJ4IZjY2XREllLQ3GwKNuFrnouTzusyDhaEmQzGH3K5xelEdh7KTVfoELpJMw46K6jTWw3
0WUHPGcCStlNm12/qtA/RUspAAGevsz1+VmI5j3Mc67GigzT4iSML3600oXf1/hHNSYFIxzVpHoqP
qkwrWGg3AgbwGvBY2d6QSNPCi4JMoTXsul+rzN1h1SfnrL07rzF4RSQfEdbbu2cLEtV/S5/rPPQ+K
9EfTamjt1bPAlw==;
From: =?utf-8?Q?Ludovic_Court=C3=A8s?= <ludo@HIDDEN>
To: Janneke Nieuwenhuizen <janneke@HIDDEN>
Subject: Re: [bug#70169] [PATCH 5/7] maint: Generate 'doc/version-LANG.texi'
reproducibly.
In-Reply-To: <947bed93d2e2fec221fdec0d247f61912fb89567.1712165977.git.janneke@HIDDEN>
(Janneke Nieuwenhuizen's message of "Wed, 3 Apr 2024 21:11:07 +0200")
References: <cover.1712165977.git.janneke@HIDDEN>
<947bed93d2e2fec221fdec0d247f61912fb89567.1712165977.git.janneke@HIDDEN>
Date: Wed, 03 Apr 2024 22:25:03 +0200
Message-ID: <87o7aqxkgw.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 70169
Cc: 70169 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
Janneke Nieuwenhuizen <janneke@HIDDEN> skribis:
> +# Define a rule to build `version[LANG].texi' reproducibly using metadat=
a from
> +# Git rather than using metadata from the filesystem.
> +define version.texi-from-git
> +override $(srcdir)/doc/stamp-$(1): $(srcdir)/$(2) $(top_srcdir)/configure
> + $$(AM_V_GEN)set -e \
> + export LC_ALL=3DC; \
> + export TZ=3DUTC0; \
> + timestamp=3D$$$$(git log --pretty=3Dformat:%ct -n1 -- $$< \
> + 2>/dev/null \
> + || echo $$(SOURCE_DATE_EPOCH)) \
> + dmy=3D$$$$(date --date=3D"@$$$$timestamp" "+%-d %B %Y"); \
> + my=3D$$$$(date --date=3D"@$$$$timestamp" "+%B %Y"); \
> + { echo "@set UPDATED $$$$dmy"; \
> + echo "@set UPDATED-MONTH $$$$my"; \
> + echo "@set EDITION $$$(VERSION)"; \
> + echo "@set VERSION $$$(VERSION)"; } > $$@-t;
> + mv $$@-t $$@
> + cp -p $$@ $$(srcdir)/doc/version$(3).texi
> +endef
> +
> +i:=3D0
> +$(eval $(call version.texi-from-git,vti,doc/guix.texi,))
> +$(foreach lang, $(MANUAL_LANGUAGES), \
> + $(eval i=3D$(shell echo $$(($(i)+1)))) \
> + $(eval $(call version.texi-from-git,$(i),po/doc/guix-manual.$(lang).po,=
-$(lang))))
Maybe we could drop =E2=80=98i=E2=80=99 and instead create =E2=80=98samp-fr=
=E2=80=99, =E2=80=98stamp-de=E2=80=99, and so
on? That is, =E2=80=98version.texi-from-git=E2=80=99 would take 2 argument=
s instead of 3.
(That=E2=80=99s really a minor issue though.)
Ludo=E2=80=99.
guix-patches@HIDDEN:bug#70169; Package guix-patches.
Full text available.Received: (at 70169) by debbugs.gnu.org; 3 Apr 2024 19:11:58 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Wed Apr 03 15:11:58 2024 Received: from localhost ([127.0.0.1]:59675 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rs61d-0001tA-KC for submit <at> debbugs.gnu.org; Wed, 03 Apr 2024 15:11:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34968) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <janneke@HIDDEN>) id 1rs61W-0001r4-AL for 70169 <at> debbugs.gnu.org; Wed, 03 Apr 2024 15:11:53 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <janneke@HIDDEN>) id 1rs61L-00013s-Vx; Wed, 03 Apr 2024 15:11:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=7/gvstY+zOeit9YGSfTKoBpkqJ4p21aBFe+MX6ZXKzs=; b=BJ5uFF0e57LFp3PJ4hjs EHQtGS0ScrhMNbOrvClLVcJTHUe+2C/Hng7mrwEBgIOCjqzreA0jXCGRsVTMFctDRE6cGWuOcxAJn lHKvJFSzDr3WbS7aJwDxo2f6vEf/mAAz7sqdV4f5VpsetRyAY1GCRZg+wOXI520/Cc04eboJwtOom dVY8EsNb5+q8zLjQdmpcOpR51nh7IFyblX8hJqzMPt/w5OWoFjrkLPvQ+iKq/YiWSWma7BaUY1y36 0qgRY7AD1nNKjCII/IFzA+VosaZ0t23RUa7JXFkCbQ6HmXrGekvejaP4Kzg9I2eaM1wWnrHEhfeS+ xjVfFezJjAZd1g==; From: Janneke Nieuwenhuizen <janneke@HIDDEN> To: 70169 <at> debbugs.gnu.org Subject: [PATCH 6/7] maint: Use reproducible Git timestamp for POT-Creation-Date. Date: Wed, 3 Apr 2024 21:11:08 +0200 Message-ID: <45e5e23d88c8846551c7493d3e9ab344dcb2f942.1712165977.git.janneke@HIDDEN> X-Mailer: git-send-email 2.41.0 In-Reply-To: <cover.1712165977.git.janneke@HIDDEN> References: <cover.1712165977.git.janneke@HIDDEN> MIME-Version: 1.0 X-Debbugs-Cc: Florian Pelz <pelzflorian@HIDDEN>, Julien Lepiller <julien@HIDDEN> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 70169 X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -3.3 (---) * po/doc/local.mk (%D%/%.pot): Replace POT-Creation-Date using timestamp from Git. (%D%/guix-manual.pot): Likewise. Change-Id: I1b7f8cc147084c1804deb7be9d36e5eeda2599cb --- po/doc/local.mk | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/po/doc/local.mk b/po/doc/local.mk index dd6ba30133..f68d67ec02 100644 --- a/po/doc/local.mk +++ b/po/doc/local.mk @@ -1,6 +1,7 @@ # GNU Guix --- Functional package management for GNU # Copyright © 2018 Julien Lepiller <julien@HIDDEN> # Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@HIDDEN> +# Copyright © 2024 Janneke Nieuwenhuizen <janneke@HIDDEN> # # This file is part of GNU Guix. # @@ -44,12 +45,19 @@ POT_OPTIONS = \ --msgid-bugs-address "bug-guix@HIDDEN" %D%/%.pot: $(srcdir)/doc/%.texi - $(AM_V_PO4A)$(PO4A_UPDATEPO) -M UTF-8 -f texinfo -m "$<" \ - -p "$@" $(POT_OPTIONS) && \ - touch $@ + $(AM_V_PO4A)$(PO4A_UPDATEPO) -M UTF-8 -f texinfo -m "$<" \ + -p "$@-t" $(POT_OPTIONS) + date=$$(git log --pretty=format:%ci -n 1 -- $< 2>/dev/null \ + || echo $(SOURCE_DATE_EPOCH)) \ + sed -ri -e "s,^(.POT-Creation-Date: )[^\]*,\1$$date," $@-t + mv $@-t $@ %D%/guix-manual.pot: %D%/guix.pot %D%/contributing.pot - msgcat $^ > $@ + msgcat $^ > $@-t + date=$$(git log --pretty=format:%ci -n 1 -- $< 2>/dev/null \ + || echo $(SOURCE_DATE_EPOCH)) \ + sed -ri "s,^(.POT-Creation-Date: )[^\]*,\1$$date," $@-t + mv $@-t $@ doc-pot-update: %D%/guix-manual.pot %D%/guix-cookbook.pot .PHONY: doc-pot-update -- 2.41.0
pelzflorian@HIDDEN, julien@HIDDEN, guix-patches@HIDDEN:bug#70169; Package guix-patches.
Full text available.Received: (at 70169) by debbugs.gnu.org; 3 Apr 2024 19:11:57 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Wed Apr 03 15:11:57 2024 Received: from localhost ([127.0.0.1]:59673 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rs61d-0001t8-4J for submit <at> debbugs.gnu.org; Wed, 03 Apr 2024 15:11:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34970) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <janneke@HIDDEN>) id 1rs61W-0001r7-LN for 70169 <at> debbugs.gnu.org; Wed, 03 Apr 2024 15:11:53 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <janneke@HIDDEN>) id 1rs61M-00016p-Rd; Wed, 03 Apr 2024 15:11:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=4S0UlO/19bjUAyI1hTF6D9hai0yyACFDl+CsYxym4+A=; b=XfAhGQbZPv6skcgs1UwS 1/xgftC6zfnveBmZkFq2rQquMd4nQf7lV2QJje9uCR1rvbRyPZ0KyElCuU6iSeZ5BSFGPYHK5s3R0 iyNHU7OPBfBF/M3i04mQsKKwKbIsbSWwWZ2BGfi/UDEmIlugz8LGEQTYrv/NF8bMhy0OAcCadeiEF C+94CR770cUcA2tqq6fBbDUktthHdHz1dwqPgUOJxVNBAhDjBHm5bZXiKOSgqTtV/dJvoS794MA0K N5WUNqZWJWlpgsXijyo1uJ/IWk7ZOoF6LFSELjzhexLlECvksoWzz4FmW+y4pDItONMetwItfAsdg +NM1gPs68MJVUA==; From: Janneke Nieuwenhuizen <janneke@HIDDEN> To: 70169 <at> debbugs.gnu.org Subject: [PATCH 7/7] maint: Ensure generated file reproducibility for dist. Date: Wed, 3 Apr 2024 21:11:09 +0200 Message-ID: <80a2280ce7a14f1b8770dad24a230a569143d304.1712165977.git.janneke@HIDDEN> X-Mailer: git-send-email 2.41.0 In-Reply-To: <cover.1712165977.git.janneke@HIDDEN> References: <cover.1712165977.git.janneke@HIDDEN> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 70169 X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -3.3 (---) * doc/local.mk (override $(srcdir)/doc/stamp-vti): New target override. (doc-clean, man-clean): New targets. (auto-clean): Depend on it in new target. (DIST_CONFIGURE_FLAGS): New variable. (dist-hook): Use them. Change-Id: I7b8a3d9ef1e4a4eddb7c329a2c27f481a451b84b --- doc/local.mk | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/doc/local.mk b/doc/local.mk index 893c99e1b1..a8e59bb7e6 100644 --- a/doc/local.mk +++ b/doc/local.mk @@ -280,3 +280,24 @@ $(eval $(call version.texi-from-git,vti,doc/guix.texi,)) $(foreach lang, $(MANUAL_LANGUAGES), \ $(eval i=$(shell echo $$(($(i)+1)))) \ $(eval $(call version.texi-from-git,$(i),po/doc/guix-manual.$(lang).po,-$(lang)))) + +DIST_CONFIGURE_FLAGS = \ + --localstatedir=/var \ + --sysconfdir=/etc + +dist: auto-clean +auto-clean: maintainer-clean-vti doc-clean man-clean + rm -f ABOUT-NLS INSTALL + rm -f aclocal.m4 configure libtool Makefile.in + git clean -fdx -- build-aux + ./bootstrap + ./configure $(DIST_CONFIGURE_FLAGS) + +doc-clean: + rm -f $(srcdir)/doc/stamp* + rm -f $(DOT_FILES:%.dot=%.png) + rm -f $(filter-out %D%/guix.texi %D%/guix-cookbook.texi, $(info_TEXINFOS)) + rm -f $(srcdir)/po/doc/*.pot $(srcdir)/po/guix/*.pot $(srcdir)/po/packages/*.pot + +man-clean: + rm -f $(srcdir)/doc/*.1 -- 2.41.0
guix-patches@HIDDEN:bug#70169; Package guix-patches.
Full text available.
Received: (at 70169) by debbugs.gnu.org; 3 Apr 2024 19:11:54 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Apr 03 15:11:54 2024
Received: from localhost ([127.0.0.1]:59671 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rs61X-0001s2-CG
for submit <at> debbugs.gnu.org; Wed, 03 Apr 2024 15:11:53 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:49312)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <janneke@HIDDEN>) id 1rs61V-0001qj-0a
for 70169 <at> debbugs.gnu.org; Wed, 03 Apr 2024 15:11:49 -0400
Received: from fencepost.gnu.org ([2001:470:142:3::e])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <janneke@HIDDEN>)
id 1rs61L-0000zi-5g; Wed, 03 Apr 2024 15:11:39 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To:
From; bh=jD6ePTMjJjOB1I3eR675QNNl+0TxWI/EHc3pSA3S8G8=; b=mOUnpnwrmdmzCf4ASrqb
npYn5wkLogltBqRxpqqcN8pJUkrihN+6gjGLxnXPGYd9ZzI0filyHr8/mZOndTa+3lldn4ugxhHSl
0PSfl7X8IO7DUuWp2sWya2MzipBmpntODSnBwgwBOeT45GtHz8tGSjlUYmn9LGLAa91XJrT9XFf8x
or9O4kc06wQi2nndHywhr+5Er/6KTEGt1ismoC1qgwPXq9uuWYxaXlrBSRWuCoKM+gnfy0YHVa7Fy
07KnV4F/P7aZg+sRsIFAxK5kWIjMJksY/SYLc4YFncGCoyOTUIyYHYXdA00TReavyibSNtrvWasN3
Xfm5Pr0UXWOr5g==;
From: Janneke Nieuwenhuizen <janneke@HIDDEN>
To: 70169 <at> debbugs.gnu.org
Subject: [PATCH 5/7] maint: Generate 'doc/version-LANG.texi' reproducibly.
Date: Wed, 3 Apr 2024 21:11:07 +0200
Message-ID: <947bed93d2e2fec221fdec0d247f61912fb89567.1712165977.git.janneke@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1712165977.git.janneke@HIDDEN>
References: <cover.1712165977.git.janneke@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 70169
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
* doc/local.mk ($(srcdir)/doc/stamp-vti): Change rule into...
(version.texi-from-git): ...this new function. Call it with vti,guix.texi,;
and for all MANUAL_LANGUAGES with $(i),po/doc/guix-manual.$(lang).po,
-$(lang.po).
Change-Id: Ia8df618178066cad320eecea0299337224e23a73
---
doc/local.mk | 42 ++++++++++++++++++++++++++----------------
1 file changed, 26 insertions(+), 16 deletions(-)
diff --git a/doc/local.mk b/doc/local.mk
index 99a7e84361..893c99e1b1 100644
--- a/doc/local.mk
+++ b/doc/local.mk
@@ -6,6 +6,7 @@
# Copyright © 2016, 2018 Mathieu Lirzin <mthl@HIDDEN>
# Copyright © 2018, 2021 Julien Lepiller <julien@HIDDEN>
# Copyright © 2019 Timothy Sample <samplet@HIDDEN>
+# Copyright © 2024 Janneke Nieuwenhuizen <janneke@HIDDEN>
#
# This file is part of GNU Guix.
#
@@ -254,19 +255,28 @@ endif
# Reproducible tarball
-# Generate 'version.texi' reproducibly using metadata from Git rather
-# than using metadata from the filesystem.
-override $(srcdir)/doc/stamp-vti: $(srcdir)/doc/guix.texi $(top_srcdir)/configure
- $(AM_V_GEN)set -e \
- export LC_ALL=C; \
- export TZ=UTC0; \
- timestamp=$$(git log --pretty=format:%ct -n1 -- $< 2>/dev/null \
- || echo $(SOURCE_DATE_EPOCH)) \
- dmy=$$(date --date="@$$timestamp" "+%-d %B %Y"); \
- my=$$(date --date="@$$timestamp" "+%B %Y"); \
- { echo "@set UPDATED $$dmy"; \
- echo "@set UPDATED-MONTH $$my"; \
- echo "@set EDITION $(VERSION)"; \
- echo "@set VERSION $(VERSION)"; } > $@-t; \
- mv $@-t $@
- @cp $@ $(srcdir)/doc/version.texi
+# Define a rule to build `version[LANG].texi' reproducibly using metadata from
+# Git rather than using metadata from the filesystem.
+define version.texi-from-git
+override $(srcdir)/doc/stamp-$(1): $(srcdir)/$(2) $(top_srcdir)/configure
+ $$(AM_V_GEN)set -e \
+ export LC_ALL=C; \
+ export TZ=UTC0; \
+ timestamp=$$$$(git log --pretty=format:%ct -n1 -- $$< \
+ 2>/dev/null \
+ || echo $$(SOURCE_DATE_EPOCH)) \
+ dmy=$$$$(date --date="@$$$$timestamp" "+%-d %B %Y"); \
+ my=$$$$(date --date="@$$$$timestamp" "+%B %Y"); \
+ { echo "@set UPDATED $$$$dmy"; \
+ echo "@set UPDATED-MONTH $$$$my"; \
+ echo "@set EDITION $$$(VERSION)"; \
+ echo "@set VERSION $$$(VERSION)"; } > $$@-t;
+ mv $$@-t $$@
+ cp -p $$@ $$(srcdir)/doc/version$(3).texi
+endef
+
+i:=0
+$(eval $(call version.texi-from-git,vti,doc/guix.texi,))
+$(foreach lang, $(MANUAL_LANGUAGES), \
+ $(eval i=$(shell echo $$(($(i)+1)))) \
+ $(eval $(call version.texi-from-git,$(i),po/doc/guix-manual.$(lang).po,-$(lang))))
--
2.41.0
guix-patches@HIDDEN:bug#70169; Package guix-patches.
Full text available.Received: (at 70169) by debbugs.gnu.org; 3 Apr 2024 19:11:51 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Wed Apr 03 15:11:51 2024 Received: from localhost ([127.0.0.1]:59669 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rs61W-0001ru-WC for submit <at> debbugs.gnu.org; Wed, 03 Apr 2024 15:11:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49296) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <janneke@HIDDEN>) id 1rs61U-0001qW-38 for 70169 <at> debbugs.gnu.org; Wed, 03 Apr 2024 15:11:48 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <janneke@HIDDEN>) id 1rs61K-0000yJ-8u; Wed, 03 Apr 2024 15:11:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=PKDkm8lbDp94w4uwEGSYLf1Png5CPHVGJLYmnkGajQU=; b=f3Ko87WLKK6Co77zS/Gw kgGHfV3dz7c0vVcpIeCXdZPcMASBujYsZmV4VNo9OkTX3156pAvD6XmsNkYf0kB3eEQVapy0qg6f8 SscYUzU+210h7bBCgHIVmMnA3B+vPLQrddLwdggu0/9RSLshwH8egqPkWQCOsCOAiSKcSMP1d+s0y 1EbYXpGX6ago5lggfFBHMaeA2LE7FG96mndv/aMG8WEr++cg/8TBd9zkFgu0EXp0xOBDb+ZO/jofk l2XArosvm1rnyryGdmkwXecv2xZcnirtskTqBawAcuYe27d2gRJ4qNB4QEvMvf+eOfBZBGtcUDSyx TSh0ppPO3PrLgw==; From: Janneke Nieuwenhuizen <janneke@HIDDEN> To: 70169 <at> debbugs.gnu.org Subject: [PATCH 4/7] maint: Help help2man generate reproducible man-pages. Date: Wed, 3 Apr 2024 21:11:06 +0200 Message-ID: <880afb1dcf4c19f493aaacfeb30912a3453e3be1.1712165977.git.janneke@HIDDEN> X-Mailer: git-send-email 2.41.0 In-Reply-To: <cover.1712165977.git.janneke@HIDDEN> References: <cover.1712165977.git.janneke@HIDDEN> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 70169 X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -3.3 (---) * doc/local.mk (SOURCE_DATE_EPOCH): New exported variable. Change-Id: I6636693695d5502657f1475d93d31949e0b0b39d --- doc/local.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/local.mk b/doc/local.mk index 4c8c852657..99a7e84361 100644 --- a/doc/local.mk +++ b/doc/local.mk @@ -224,6 +224,9 @@ gen_man = \ $(HELP2MANFLAGS) HELP2MANFLAGS = --source=GNU --info-page=$(PACKAGE_TARNAME) +# help2man reproducibility +SOURCE_DATE_EPOCH = $(shell git show HEAD --format=%ct --no-patch 2>/dev/null || echo 0) +export SOURCE_DATE_EPOCH $(srcdir)/%D%/guix.1: scripts/guix.in $(sub_commands_mans) -$(AM_V_HELP2MAN)$(gen_man) --output="$@" `basename "$@" .1` -- 2.41.0
guix-patches@HIDDEN:bug#70169; Package guix-patches.
Full text available.
Received: (at 70169) by debbugs.gnu.org; 3 Apr 2024 19:11:51 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Apr 03 15:11:51 2024
Received: from localhost ([127.0.0.1]:59665 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rs61W-0001rl-FQ
for submit <at> debbugs.gnu.org; Wed, 03 Apr 2024 15:11:50 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:49280)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <janneke@HIDDEN>) id 1rs61T-0001qL-Ay
for 70169 <at> debbugs.gnu.org; Wed, 03 Apr 2024 15:11:47 -0400
Received: from fencepost.gnu.org ([2001:470:142:3::e])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <janneke@HIDDEN>)
id 1rs61J-0000xr-Bj; Wed, 03 Apr 2024 15:11:37 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To:
From; bh=HA6GzH6uld62+0AFE1fJcB8wB0uy32X2XUiBkF35ZuY=; b=Y8Z9iIfDqCnQDQwqc+cs
MOGuXaUqCR9SqTdngH9C0BvcF5aq+waw5PsOTBPRk+PiF+Ubem0qwgl2y2/pQH4Qc+8FouINExn2Q
KG8hypLPgCiv35RP1UGxxoVB8S7P/tCTITB2UGGQfpaTZO2c5xcs1eCGMUE1LucvKh2yB5IySQoR+
ISSw8SX6LlNKGTDUnTRszFZdSyWZEb5U3+r4tHK+sqP/9EOPCifRv6+yCOA8PXhJ4EJm1/b7T713C
N3ddLte7PFl/x/D5bzP6P9dWCdnhuaYk05HQOroxPn/t2By7Sa/VovM2yBmznCzBPeXLeAhJkZ1Tb
IMNLilYhuq5xcQ==;
From: Janneke Nieuwenhuizen <janneke@HIDDEN>
To: 70169 <at> debbugs.gnu.org
Subject: [PATCH 3/7] maint: Generate 'doc/version.texi' reproducibly.
Date: Wed, 3 Apr 2024 21:11:05 +0200
Message-ID: <285de866686d0e8ffdbae88b4cc5e06d5fee69ca.1712165977.git.janneke@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1712165977.git.janneke@HIDDEN>
References: <cover.1712165977.git.janneke@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 70169
Cc: Timothy Sample <samplet@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
From: Timothy Sample <samplet@HIDDEN>
* doc/local.mk ($(srcdir)/doc/stamp-vti): New rule (overriding one provided
by Automake).
Co-authored-by: Janneke Nieuwenhuizen <janneke@HIDDEN>
Change-Id: If44965e9a3ecfb45865c58ee7a558951be8d15ae
---
doc/local.mk | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/doc/local.mk b/doc/local.mk
index 8df003b891..4c8c852657 100644
--- a/doc/local.mk
+++ b/doc/local.mk
@@ -5,6 +5,7 @@
# Copyright © 2016 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@HIDDEN>
# Copyright © 2016, 2018 Mathieu Lirzin <mthl@HIDDEN>
# Copyright © 2018, 2021 Julien Lepiller <julien@HIDDEN>
+# Copyright © 2019 Timothy Sample <samplet@HIDDEN>
#
# This file is part of GNU Guix.
#
@@ -247,3 +248,22 @@ $(srcdir)/%D%/guix-daemon.1: guix-daemon$(EXEEXT)
endif
endif
+
+# Reproducible tarball
+
+# Generate 'version.texi' reproducibly using metadata from Git rather
+# than using metadata from the filesystem.
+override $(srcdir)/doc/stamp-vti: $(srcdir)/doc/guix.texi $(top_srcdir)/configure
+ $(AM_V_GEN)set -e \
+ export LC_ALL=C; \
+ export TZ=UTC0; \
+ timestamp=$$(git log --pretty=format:%ct -n1 -- $< 2>/dev/null \
+ || echo $(SOURCE_DATE_EPOCH)) \
+ dmy=$$(date --date="@$$timestamp" "+%-d %B %Y"); \
+ my=$$(date --date="@$$timestamp" "+%B %Y"); \
+ { echo "@set UPDATED $$dmy"; \
+ echo "@set UPDATED-MONTH $$my"; \
+ echo "@set EDITION $(VERSION)"; \
+ echo "@set VERSION $(VERSION)"; } > $@-t; \
+ mv $@-t $@
+ @cp $@ $(srcdir)/doc/version.texi
--
2.41.0
guix-patches@HIDDEN:bug#70169; Package guix-patches.
Full text available.
Received: (at 70169) by debbugs.gnu.org; 3 Apr 2024 19:11:50 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Apr 03 15:11:50 2024
Received: from localhost ([127.0.0.1]:59661 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rs61W-0001rj-05
for submit <at> debbugs.gnu.org; Wed, 03 Apr 2024 15:11:50 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:49266)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <janneke@HIDDEN>) id 1rs61S-0001qJ-Ao
for 70169 <at> debbugs.gnu.org; Wed, 03 Apr 2024 15:11:47 -0400
Received: from fencepost.gnu.org ([2001:470:142:3::e])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <janneke@HIDDEN>)
id 1rs61I-0000xb-GH; Wed, 03 Apr 2024 15:11:36 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To:
From; bh=HP9yacvC/vG8x6eHapwUJBqUkydEWlJa7qyhvBptK1M=; b=JGdKIjbRTe8Yq/HZD2yW
6tK7rdma8j4NfrH9Nf4mpeXJ0B+7ORAphnx1Bo1YeVrlf/ueEsxzW7T8RqeWby9KQwNLehWe9rZgI
PWy8hUs8HNV03Xixfs9/QL96qjUfvkJw+nh6xS4QhX3z007buv/Z1c4awZfkS8iPwz4iw1SyiMbyl
Rq2FBkjEnH5bs8nZGtZFHhKON+TSNZbNJyWfRL3vQIF6jlAWglEqorxhbt0ehcAKPtpx9IRmTvK/u
uu+KpqQPS88Ma95cq+DwSJTqi1D2BEuSMd9R1DPTuLNRNBPG/FFdG6r8EVf8nDT3sQHF+pjBzCx8F
akSZ43EhNLoSaw==;
From: Janneke Nieuwenhuizen <janneke@HIDDEN>
To: 70169 <at> debbugs.gnu.org
Subject: [PATCH 2/7] maint: Use reproducible timestamps and name for tarball.
Date: Wed, 3 Apr 2024 21:11:04 +0200
Message-ID: <05e6677d56a3a23ae8526cc56c14c7de33a8254a.1712165977.git.janneke@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1712165977.git.janneke@HIDDEN>
References: <cover.1712165977.git.janneke@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 70169
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
* Makefile.am (gen-tarball-version): Add reproducible timestamp to tarball.
(am__tar): Use it in new variable, overriding the Automake default.
(GZIP_ENV): New variable, overriding the Automake default.
Change-Id: Iea5c2f80eaf24b2f2d80e651c73c348231de8d63
---
Makefile.am | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/Makefile.am b/Makefile.am
index 2b5e145095..c33d69ed9f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,7 +7,7 @@
# Copyright © 2017 Mathieu Othacehe <m.othacehe@HIDDEN>
# Copyright © 2017 Leo Famulari <leo@HIDDEN>
# Copyright © 2017 Ricardo Wurmus <rekado@HIDDEN>
-# Copyright © 2017, 2020, 2023 Janneke Nieuwenhuizen <janneke@HIDDEN>
+# Copyright © 2017, 2020, 2023, 2024 Janneke Nieuwenhuizen <janneke@HIDDEN>
# Copyright © 2017 Arun Isaac <arunisaac@HIDDEN>
# Copyright © 2018 Nikita <nikita@HIDDEN>
# Copyright © 2018 Julien Lepiller <julien@HIDDEN>
@@ -970,6 +970,7 @@ $(top_srcdir)/.version: config.status
gen-tarball-version:
echo $(VERSION) > "$(distdir)/.tarball-version"
+ git show HEAD --format=%ct --no-patch > $(distdir)/.tarball-timestamp
gen-ChangeLog:
$(AM_V_GEN)if test -e .git; then \
@@ -1002,6 +1003,17 @@ dist-with-updated-version:
# Release management.
#
+# Reproducible tarball
+GZIP_ENV = --no-name
+# Be friendly to Debian; avoid using EPOCH
+am__tar = $${TAR-tar} \
+ --sort=name \
+ --mode=go=rX,u+rw,a-s \
+ --mtime=@$$(cat "$$tardir"/.tarball-timestamp) \
+ --owner=0 --group=0 --numeric-owner \
+ -cf - \
+ "$$tardir"
+
releasedir = release-$(PACKAGE_VERSION)
PACKAGE_FULL_TARNAME = $(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
--
2.41.0
guix-patches@HIDDEN:bug#70169; Package guix-patches.
Full text available.Received: (at 70169) by debbugs.gnu.org; 3 Apr 2024 19:11:48 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Wed Apr 03 15:11:48 2024 Received: from localhost ([127.0.0.1]:59655 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rs61T-0001rE-Hk for submit <at> debbugs.gnu.org; Wed, 03 Apr 2024 15:11:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49254) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <janneke@HIDDEN>) id 1rs61S-0001qI-7G for 70169 <at> debbugs.gnu.org; Wed, 03 Apr 2024 15:11:46 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <janneke@HIDDEN>) id 1rs61G-0000qR-GC; Wed, 03 Apr 2024 15:11:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=q+rZKnDHKGZdZJcJPA/zMKlTSK8VKTBca9VS8g34lA8=; b=g95b/+Aj28BuZ6j4wyUQ 1CLY4ZAKUnZWwRzNUcLj2tpgvXgrY+XiT1JLMib+YAWz8kXKHzSECnepFXU5cnhhcHtx3Iee5JHQY 7odGz/mf8AaR6f2aUVuT9rdY4ZRfG3vcM0lMOy+nr0BQgc1nhMwtSCaUUaJTJS7fzgGCxII0v2YN0 +54lxek5E02wtRwK4f01F1Nl6y1q0Qh2zeb3g1ySq6GzLvaxpmhNF8QgwejmSYo3N7XcZY8o9VbVO 0PIdbRXN5kur5qIIQQ+jTKAqz/y86Oa70J93xnk4jjK+/TYFJvNL//ws2qT/qy6dsez6B8xROuICK 13BHd1ESE2VoFQ==; From: Janneke Nieuwenhuizen <janneke@HIDDEN> To: 70169 <at> debbugs.gnu.org Subject: [PATCH 1/7] maint: Cater for running `make dist' from a worktree. Date: Wed, 3 Apr 2024 21:11:03 +0200 Message-ID: <bafaaf24acd7bfeb249a1378eda096e3e9936afb.1712165977.git.janneke@HIDDEN> X-Mailer: git-send-email 2.41.0 In-Reply-To: <cover.1712165977.git.janneke@HIDDEN> References: <cover.1712165977.git.janneke@HIDDEN> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 70169 X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -3.3 (---) * Makefile.am (gen-ChangeLog): Check for existance of `.git', rather than it being a directory. (gen-AUTHORS): Likewise. Change-Id: I1b7f8cc147084c1804deb7be9d36e5eeda2599cb --- Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 1c5688ac13..2b5e145095 100644 --- a/Makefile.am +++ b/Makefile.am @@ -972,7 +972,7 @@ gen-tarball-version: echo $(VERSION) > "$(distdir)/.tarball-version" gen-ChangeLog: - $(AM_V_GEN)if test -d .git; then \ + $(AM_V_GEN)if test -e .git; then \ $(top_srcdir)/build-aux/gitlog-to-changelog \ > $(distdir)/ChangeLog.tmp; \ rm -f $(distdir)/ChangeLog; \ @@ -980,7 +980,7 @@ gen-ChangeLog: fi gen-AUTHORS: - $(AM_V_GEN)if test -d .git; then \ + $(AM_V_GEN)if test -e .git; then \ rm -f "$(distdir)/AUTHORS"; \ $(top_builddir)/pre-inst-env "$(GUILE)" \ "$(top_srcdir)/build-aux/generate-authors.scm" \ -- 2.41.0
guix-patches@HIDDEN:bug#70169; Package guix-patches.
Full text available.
Received: (at submit) by debbugs.gnu.org; 3 Apr 2024 19:09:01 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Apr 03 15:09:01 2024
Received: from localhost ([127.0.0.1]:59645 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rs5ym-0001jY-QG
for submit <at> debbugs.gnu.org; Wed, 03 Apr 2024 15:09:01 -0400
Received: from lists.gnu.org ([2001:470:142::17]:39818)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <janneke@HIDDEN>) id 1rs5yi-0001jG-Js
for submit <at> debbugs.gnu.org; Wed, 03 Apr 2024 15:08:59 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10])
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <janneke@HIDDEN>) id 1rs5yY-0006jB-B9
for guix-patches@HIDDEN; Wed, 03 Apr 2024 15:08:46 -0400
Received: from fencepost.gnu.org ([2001:470:142:3::e])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <janneke@HIDDEN>)
id 1rs5yX-0006cP-QL; Wed, 03 Apr 2024 15:08:45 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
s=fencepost-gnu-org; h=MIME-Version:Date:Subject:To:From:in-reply-to:
references; bh=Ucp83uaQSzFaAZqJQ3LjYeSjl286TvXhc2qR4aJZNEQ=; b=hrZprcx8ojkiD7
in36bgrM8b82MDSNhk3jR9za5nKV76NhyQDPUbDE9f4VZFASZhSTwLGE/lNLcYe3iJUp0Bd05dPqS
MpaBouz0YxSuj/F8J+aGGC8fNcjlrPP1n8D43+4K7RZG4jfHf7LJbEuyDZUecpPvgMn4/nDQhksR6
a6rG2c9Iyl0opcWFUP2I7iOZimQzC9V4XSR15Rlt3pPYjZMk6HZYj0lPd4ar4ZsVd/Dr4oGPvwm6t
DOfU/skGmpyqM0RbsxDyGoP+opXmzJLhISpgMGiD5OqWDOYDgI0iu8CRV0Gb+EaBHJE4+Ayox9yUP
nI/cqB2DCeN7v2E94YOA==;
From: Janneke Nieuwenhuizen <janneke@HIDDEN>
To: guix-patches@HIDDEN
Subject: [PATCH 0/7] Reproducible `make dist' tarball in defiance of Autotools
and Gettext
Date: Wed, 3 Apr 2024 21:08:40 +0200
Message-ID: <cover.1712165977.git.janneke@HIDDEN>
X-Mailer: git-send-email 2.41.0
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: submit
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
Hi,
The recent XZ-utils <https://www.openwall.com/lists/oss-security/2024/03/29/4>
debacle inspired me to resurrect and finish my patch set for creating a
reproducible source tarball for Guix, i.e., finally have `make dist' be
reproducible (when run from Git). I've been using a version of these patches
in simpler projects for some years now and stole one from Timothy Samplet's
Gash project.
Autotools and Gettext still make it harder than necessary to do reproducible
(responsible?) computing, which is especially sad given the fact that the
Reproducible Builds project recently had their 10th birthday
<https://reproducible-builds.org/_lfs/presentations/2023-05-27-R-B-the-first-10-years/#/>.
Gettext tooling embeds timestamps found in the file-system, fails to respect
SOURCE_DATE_EPOCH, and lacks options like `--pot-creation-date' so that we
have to resort to SED to fixup. The caching of all sorts of information, in
separate build stages, also doesn't help.
To create a reproducible source tarball, having a reproducible build
environment is a prerequitite, so this would have to be recorded too.
Using this patch set, I created a tarball doing something like
--8<---------------cut here---------------start------------->8---
guix pull --commit=1dbe492b993a7629df3b35146ce0272b52913776
guix shell
bootstrap && ./configure --localstatedir=/var --sysconfdir=/etc && make dist
guix hash guix-1.3.0.57425-80a228.tar.gz
0mk59ay5k2dxmjni9fx4i8qyfhvlgxbhqzsjpg2pbw381nskkxbj
--8<---------------cut here---------------end--------------->8---
and I've uploaded it to
https://lilypond.org/janneke/guix/guix-1.3.0.57425-80a228.tar.gz
Who can reproduce it...and WDYT?
(I've also pushed this patch set to `wip-tarball', as a slight difference
may already produce another tarball).
Greetings,
Janneke
Janneke Nieuwenhuizen (6):
maint: Cater for running `make dist' from a worktree.
maint: Use reproducible timestamps and name for tarball.
maint: Help help2man generate reproducible man-pages.
maint: Generate 'doc/version-LANG.texi' reproducibly.
maint: Use reproducible Git timestamp for POT-Creation-Date.
maint: Ensure generated file reproducibility for dist.
Timothy Sample (1):
maint: Generate 'doc/version.texi' reproducibly.
Makefile.am | 18 ++++++++++++++---
doc/local.mk | 54 +++++++++++++++++++++++++++++++++++++++++++++++++
po/doc/local.mk | 16 +++++++++++----
3 files changed, 81 insertions(+), 7 deletions(-)
base-commit: df64d48e6f9f648044aa5279c045b8d6f7bee604
--
2.41.0
Janneke Nieuwenhuizen <janneke@HIDDEN>:guix-patches@HIDDEN.
Full text available.guix-patches@HIDDEN:bug#70169; Package guix-patches.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.