From patchwork Sat May 29 05:31:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Dong X-Patchwork-Id: 29642 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 AF0FD27BC81; Sat, 29 May 2021 06:32:09 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4B56B27BC78 for ; Sat, 29 May 2021 06:32:09 +0100 (BST) Received: from localhost ([::1]:45948 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lmrZw-0005mR-Fv for patchwork@mira.cbaines.net; Sat, 29 May 2021 01:32:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:32946) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lmrZq-0005m1-Ct for guix-patches@gnu.org; Sat, 29 May 2021 01:32:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:44190) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lmrZq-00023f-5O for guix-patches@gnu.org; Sat, 29 May 2021 01:32:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lmrZq-00028m-1x for guix-patches@gnu.org; Sat, 29 May 2021 01:32:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48726] [PATCH] gnu: nsis: Respect SOURCE-DATE-EPOCH for reproducibility Resent-From: Carl Dong Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 29 May 2021 05:32:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 48726 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48726@debbugs.gnu.org Cc: Carl Dong X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16222662788172 (code B ref -1); Sat, 29 May 2021 05:32:01 +0000 Received: (at submit) by debbugs.gnu.org; 29 May 2021 05:31:18 +0000 Received: from localhost ([127.0.0.1]:55736 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lmrZ7-00027k-Ow for submit@debbugs.gnu.org; Sat, 29 May 2021 01:31:18 -0400 Received: from lists.gnu.org ([209.51.188.17]:33448) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lmrZ5-00027b-9z for submit@debbugs.gnu.org; Sat, 29 May 2021 01:31:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:32922) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lmrZ5-0005jU-2x for guix-patches@gnu.org; Sat, 29 May 2021 01:31:15 -0400 Received: from wout5-smtp.messagingengine.com ([64.147.123.21]:43145) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lmrZ2-0001JN-IB for guix-patches@gnu.org; Sat, 29 May 2021 01:31:14 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id 6B5E111CB; Sat, 29 May 2021 01:31:10 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Sat, 29 May 2021 01:31:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=carldong.me; h= from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; s=fm1; bh=h5QZ5ZDFp81sM/Y9ZeAvBByNRM VfA2U3+zHFKn67fKk=; b=RDp+8aaIZBE2wtQafE43e7hWzp5PF1d1wsN++ppvIW lvbrPt+lvb/o4hdx5K/rgvft3CtRq4pBGnDdhxKMx8QvTwDSjW4MXOj0enhe353x RhBRPg6+MoQqvJslo5N8XVH3EHv5gsI1yYV2HrVXwKwEvKgN4bCTCrs8EftUawGo Nlkz5vG+JvBz3sVGQqoPx5/wsIxbYgIahC8SELqOYwCVubFihTblgSkdQmaJJFas s1oh47T1CPWB449eVkj+DmH6r2JS77ARdKa3165tiUeea/Vld/8EuJfbnUvxg/FK JnvjNhZZnjxWWSNfprt1d1ofAp+JsMHe53GhiT0WbNeQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :message-id:mime-version:subject:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=h5QZ5ZDFp81sM/Y9Z eAvBByNRMVfA2U3+zHFKn67fKk=; b=WDMPr4mvrH9ZkIgugBYvOG1ay6j4XZm9U vbScsz9X+3JZqkA7v2ByYj7WLOLHrbmVMthxTZzEpwuEyHsO6qxdDf06whu6fpOI LcenJkZyI5XGEgCbUQZgc0G6tpMV+bpDdvOp1kf+2lqRj1hmq4VX5HdI1XlkeB6J jzxDz4cE0+eeC6DuzvPz+xB1l03tcEJ2sJDyuFRdic/QTuUx2QvjdWG4XulIR662 WJKKo7mgN7Kbf4JXbUnprKmPZ7+ocAtllN3soe395WEqZPT2ZFAkprbvuaOUM0z1 KtDAh/MWkGWhrrw40449YBSdoBq6ioBWHAMacA+g5oUdiQGaz/ICg== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrvdekkedgleeiucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgggfestdekredtre dttdenucfhrhhomhepvegrrhhlucffohhnghcuoegtohhnthgrtghtsegtrghrlhguohhn ghdrmhgvqeenucggtffrrghtthgvrhhnpeelueeuleelieekffdtueeifeevhfejfffhff ejheevleehffffieeigeetjeevkeenucfkphepgedrheefrdelvddruddugeenucevlhhu shhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpegtohhnthgrtghtse gtrghrlhguohhnghdrmhgv X-ME-Proxy: Received: from dai.int.chaincode.com (unknown [4.53.92.114]) by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 29 May 2021 01:31:09 -0400 (EDT) From: Carl Dong Date: Sat, 29 May 2021 01:31:07 -0400 Message-Id: <20210529053107.381628-1-contact@carldong.me> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Received-SPF: pass client-ip=64.147.123.21; envelope-from=contact@carldong.me; helo=wout5-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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 * gnu/packages/patches/nsis-SConstruct-sde-support.patch: New patch. * gnu/packages/installers.scm (make-nsis)[source]: Apply it. --- gnu/packages/installers.scm | 3 ++- .../patches/nsis-SConstruct-sde-support.patch | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/nsis-SConstruct-sde-support.patch diff --git a/gnu/packages/installers.scm b/gnu/packages/installers.scm index 775b91f0f7..3587174d06 100644 --- a/gnu/packages/installers.scm +++ b/gnu/packages/installers.scm @@ -42,7 +42,8 @@ (sha256 (base32 "1sbwx5vzpddharkb7nj4q5z3i5fbg4lan63ng738cw4hmc4v7qdn")) - (patches (search-patches "nsis-env-passthru.patch")))) + (patches (search-patches "nsis-env-passthru.patch" + "nsis-SConstruct-sde-support.patch")))) (build-system scons-build-system) (native-inputs `(("xgcc" ,xgcc) ("xbinutils" ,xbinutils) diff --git a/gnu/packages/patches/nsis-SConstruct-sde-support.patch b/gnu/packages/patches/nsis-SConstruct-sde-support.patch new file mode 100644 index 0000000000..5edf1b7c8e --- /dev/null +++ b/gnu/packages/patches/nsis-SConstruct-sde-support.patch @@ -0,0 +1,15 @@ +diff --git a/SConstruct b/SConstruct +index e8252c9..41786f2 100755 +--- a/SConstruct ++++ b/SConstruct +@@ -95,8 +95,8 @@ default_doctype = 'html' + if defenv.WhereIs('hhc', os.environ['PATH']): + default_doctype = 'chm' + +-from time import strftime, gmtime +-cvs_version = strftime('%d-%b-%Y.cvs', gmtime()) ++import time ++cvs_version = time.strftime('%d-%b-%Y.cvs', time.gmtime(int(os.environ.get('SOURCE_DATE_EPOCH', time.time())))) + + opts = Variables() +