From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:35481) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h8u1L-0000wW-CJ for guix-patches@gnu.org; Tue, 26 Mar 2019 17:54:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h8u1J-0003G6-Ce for guix-patches@gnu.org; Tue, 26 Mar 2019 17:54:11 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47100) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h8u1C-0003Bp-3J for guix-patches@gnu.org; Tue, 26 Mar 2019 17:54:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1h8u1B-0000yk-VK for guix-patches@gnu.org; Tue, 26 Mar 2019 17:54:01 -0400 Subject: [bug#35011] [PATCH] gnu: gpodder: Build reproducibly. Resent-Message-ID: Received: from eggs.gnu.org ([209.51.188.92]:35356) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h8u0z-0000tI-UA for guix-patches@gnu.org; Tue, 26 Mar 2019 17:53:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h8tzr-0002Vv-NL for guix-patches@gnu.org; Tue, 26 Mar 2019 17:52:40 -0400 Received: from mout.gmx.net ([212.227.17.21]:56823) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h8tzr-0002Ux-7T for guix-patches@gnu.org; Tue, 26 Mar 2019 17:52:39 -0400 From: Pierre Langlois Date: Tue, 26 Mar 2019 21:52:33 +0000 Message-ID: <87wokll2vy.fsf@gmx.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 35011@debbugs.gnu.org --=-=-= Content-Type: text/plain Hello Guix! I just realised the gpodder package was not deterministic because of 'POT-Creation-Date' entries in the .po files. I forgot to check for determinism before sending that patch, whoops! :-) Tested with: ``` ./pre-inst-env guix build --no-grafts --check --rounds=2 gpodder (...) /gnu/store/15l476abksby4awsnvckm3ai59fgxb9x-gpodder-3.10.7 ``` Which would give us: ``` guix build: error: derivation `/gnu/store/k0my78v8n5r9xdxcip3q7dm6xzb80-gpodder-3.10.7.drv' may not be deterministic: output `/gnu/store/fmaplc6y2dv4ys3n4fcpziaw83p3smf4-gpodder-3.10.7' differs ``` Thanks! Pierre --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-gnu-gpodder-Build-reproducibly.patch Content-Transfer-Encoding: quoted-printable =46rom 2e45e7c875b384e80099f9ce76009e2116472ef2 Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Tue, 26 Mar 2019 21:41:59 +0000 Subject: [PATCH] gnu: gpodder: Build reproducibly. * gnu/packages/gpodder.scm (gpodder)[arguments]: Add 'do-not-run-msgmerge' phase before 'install'. =2D-- gnu/packages/gpodder.scm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gnu/packages/gpodder.scm b/gnu/packages/gpodder.scm index ea1a3108ca..badb7f867f 100644 =2D-- a/gnu/packages/gpodder.scm +++ b/gnu/packages/gpodder.scm @@ -69,6 +69,13 @@ (substitute* "src/gpodder/util.py" (("xdg-open") (string-append xdg-utils "/bin/xdg-open"))= ) #t))) + ;; 'msgmerge' introduces non-determinism by resetting the + ;; POT-Creation-Date in .po files. + (add-before 'install 'do-not-run-msgmerge + (lambda _ + (substitute* "makefile" + (("msgmerge") "true")) + #t)) (add-before 'install 'make-po-files-writable (lambda _ (for-each =2D- 2.21.0 --=-=-=--