From patchwork Tue Mar 26 21:52:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 1572 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id D0CCB16CD1; Tue, 26 Mar 2019 21:54:17 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id A778816CC2 for ; Tue, 26 Mar 2019 21:54:16 +0000 (GMT) Received: from localhost ([127.0.0.1]:38406 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h8u1Q-0000x0-0z for patchwork@mira.cbaines.net; Tue, 26 Mar 2019 17:54:16 -0400 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 X-Loop: help-debbugs@gnu.org Subject: [bug#35011] [PATCH] gnu: gpodder: Build reproducibly. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 26 Mar 2019 21:54:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 35011 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35011@debbugs.gnu.org X-Debbugs-Original-To: Guix-patches Received: via spool by submit@debbugs.gnu.org id=B.15536372383751 (code B ref -1); Tue, 26 Mar 2019 21:54:01 +0000 Received: (at submit) by debbugs.gnu.org; 26 Mar 2019 21:53:58 +0000 Received: from localhost ([127.0.0.1]:60644 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1h8u18-0000yQ-1n for submit@debbugs.gnu.org; Tue, 26 Mar 2019 17:53:58 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49219) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1h8u16-0000yD-Bv for submit@debbugs.gnu.org; Tue, 26 Mar 2019 17:53:56 -0400 Received: from lists.gnu.org ([209.51.188.17]:53287) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h8u10-000313-U0 for submit@debbugs.gnu.org; Tue, 26 Mar 2019 17:53:50 -0400 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1553637155; bh=ecDCtVAq/aZaBJhfkhF2j2Vu8KpfpWDkqtey1D48uRU=; h=X-UI-Sender-Class:From:To:Subject:CC:Date; b=LIlN3OzyIBb1JKZZUXHcaNH9P2CB/IrukalfN5T3MeqQMuwza7OwekBr3Lrxkc+h2 iGnnplnZd6zuxDWhBTaprapCNmKW4jJcJcUgrCsU3dGRX0G/Ll/yCi2853lySLZB3a 9oFs/nRhMiRS3qBwES966q0pIlcaFmiPyZBINTKU= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from labiere ([2.99.199.214]) by mail.gmx.com (mrgmx102 [212.227.17.174]) with ESMTPSA (Nemesis) id 0Lfppu-1gbDw10Hta-00pPtN; Tue, 26 Mar 2019 22:52:35 +0100 User-agent: mu4e 1.1.0; emacs 26.1 From: Pierre Langlois Date: Tue, 26 Mar 2019 21:52:33 +0000 Message-ID: <87wokll2vy.fsf@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:HiTq3E6GKYI3+CFfn6QbTTToWQvhuPvYazgehO81MlcRRZJQ0DP OL1upF+OpBdueNwH3e/pRoCcPwP1xhRHhUFlypHczxEn2zJjqIWNMMHrL+p+Flpz0wlaQKO 6KIzGjD4qFEGDTW+mUNO8/CLRz5nTFtZoAP64/z/wfVRzktfUIqgR0IaNBQ5jEG6fj5WmP2 7BiCfwuGyJ9TwEMWZCOpA== X-UI-Out-Filterresults: notjunk:1;V03:K0:OxU2A34OBUA=:KV9V4dVNme8G5y/P1oXMuy M2s+nw/QJOh4Pbe2ehCUjJq06TuMIGzVBtH4TZmJgaE2R4H+G9PxOkip/2lpTRhJ1RulMUnx1 NWO/ToDBuLfgNWA9oS3MvhIcYoWwNgMXLtn9Kdz4TP7/FhfqlF2Zr7PlktB8oYf5GtixVsBON oXIn9UTuOJlRop3UrmFSGZAGYzmwTTMR6KaW6mobR4Z1531Y7NVF261Y1Xu5estnPdsMcVNYr wneWwRfWp0EuCm76gDLou3Y9PB+CjB0WfLAV2iZQOkmCJ9j3bQapXodQ2RmfkgTOQUS1SLDP0 aFN9gl5Vcq+GVhd+Pm4apgWuioS5Bz+Bsbxo/RH+f87sj5kp6g5A71XVFEs4Tqh7qiPdHZLoE KRlDJrDZ+7eZZfGcwNyndVijtn6mpz99DujaFYGIsX0sRmHsuw6BE5bWSAMsr7lKjvl5lUMor zvlqcVPILBP6ks8X+nssKalSbsKhglZybsEg0M4UjEiaBUbMJHS2BuDI+p+g30HJJZtaLjAMT x5j73SGpL/CdMW+0klEnDB+LCceF1k/2WxfI7+ptEcbLtZZ7XqlUPU8Ppo+ccvDYJP40j8S17 v+sJ/VSSU3RMYNakOG65036DmnsAvvaCggBpotdKY2//ii9rBoCxpJFJ3TmONUwCdIYCezea1 rwx+2sArGAu4ac/1AnaefGQVbHx1yjxuJ2XCmUtNEuAkgEPSA89wXzd85tKIXL/ObMwTNwl+k a7g3xemdsak+GddVythvRw9FbPM32rZw2n/0fpsBshug7Vum7X3KnUSwb8danwMeG666WwaJ3 rkU4SXBIj736lnFnMl+Rx6xu0B0VOEeuERs1luDcmwG5OcEa6vkslIebLi2TSE4Csl34uzaQN w31ugaEgrUhZIqvvj6YnU71LPqM/xoCxKOeikui4oslsTYbndHoz9fvq0tUKKH X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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 From 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'. --- 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 --- 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 -- 2.21.0