From unknown Fri Aug 15 17:19:26 2025 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 Content-Transfer-Encoding: 8bit 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-Spam-Score: -1.6 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.6 (--) * 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() + -- 2.31.1 From unknown Fri Aug 15 17:19:26 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#48726] [PATCH] gnu: nsis: Respect SOURCE-DATE-EPOCH for reproducibility Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 29 May 2021 09:00:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48726 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Carl Dong , 48726@debbugs.gnu.org Received: via spool by 48726-submit@debbugs.gnu.org id=B48726.162227877929570 (code B ref 48726); Sat, 29 May 2021 09:00:02 +0000 Received: (at 48726) by debbugs.gnu.org; 29 May 2021 08:59:39 +0000 Received: from localhost ([127.0.0.1]:55994 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lmuok-0007gs-Nv for submit@debbugs.gnu.org; Sat, 29 May 2021 04:59:38 -0400 Received: from xavier.telenet-ops.be ([195.130.132.52]:34142) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lmuoi-0007gg-Jq for 48726@debbugs.gnu.org; Sat, 29 May 2021 04:59:38 -0400 Received: from ptr-bvsjgyjmffd7q9timvx.18120a2.ip6.access.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by xavier.telenet-ops.be with bizsmtp id AYza250020mfAB401Yza8c; Sat, 29 May 2021 10:59:34 +0200 Message-ID: <0aad0d5c40ba12167b33ae3acbf470acbd634018.camel@telenet.be> From: Maxime Devos Date: Sat, 29 May 2021 10:59:26 +0200 In-Reply-To: <20210529053107.381628-1-contact@carldong.me> References: <20210529053107.381628-1-contact@carldong.me> Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-QVscn1/86AKCUQ+i7gMK" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1622278774; bh=LMUAIQFrv1GF11yqhzwgexTFu95X5glO9yvKH1gq488=; h=Subject:From:To:Date:In-Reply-To:References; b=gnAyN+P7ZfvUEOio6B5llxeKmImzv/icGUTYN51pBN8dqS2P5xzceYuIkCGX2EEb/ jeMZIK0ccdnQ7SyrAf6snmP4x+BkWk3CBzvwKzJeAium3bChD1/fJsNseLWmZhqbLS haQxzW4NRSI7cLXdN4nSpqBtibam5Ykoa76Euj5FH02NHqnAMyIIz6FOE7U4LJydvd Ty+6OzAwXIjZGPGt4b7F/XZG3tZz6aWCI6bZDBxak/pprroUIeTPFpXg0BQSqoWWy4 5DtJmE4T05MdKTHWSqPEqLXOl6pejtnuark3beqO6gD1kMIUBgDURBc4sZHRjb+zsb xMIXFQDk2AdkA== X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-QVscn1/86AKCUQ+i7gMK Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Carl Dong schreef op za 29-05-2021 om 01:31 [-0400]: > * gnu/packages/patches/nsis-SConstruct-sde-support.patch: New patch. > * gnu/packages/installers.scm (make-nsis)[source]: Apply it. > [...] More reproducibility, good! One question: does upstream know about the patch? If accepted upstream, then other distro's will automatically be a little more reproducible as well. In the mean time (or if the patch isn't accepted upstream) we can patch nsis in guix. Greetings, Maxime. --=-QVscn1/86AKCUQ+i7gMK Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYLICbhccbWF4aW1lZGV2 b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7lo6AQCQF7+bOgaJGeg/5TiBaYO+JU8u Axp+3g+pM1F3v49NbAD9H6JwsmQ9KXrjkP/b2WClBFQTkFtNdE/xi4qKaaBxjAA= =nZet -----END PGP SIGNATURE----- --=-QVscn1/86AKCUQ+i7gMK-- From unknown Fri Aug 15 17:19:26 2025 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: Sun, 30 May 2021 18:55:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48726 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Maxime Devos Cc: 48726@debbugs.gnu.org Received: via spool by 48726-submit@debbugs.gnu.org id=B48726.16224008789507 (code B ref 48726); Sun, 30 May 2021 18:55:02 +0000 Received: (at 48726) by debbugs.gnu.org; 30 May 2021 18:54:38 +0000 Received: from localhost ([127.0.0.1]:60352 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lnQa6-0002TH-7v for submit@debbugs.gnu.org; Sun, 30 May 2021 14:54:38 -0400 Received: from wout3-smtp.messagingengine.com ([64.147.123.19]:58075) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lnQa4-0002T3-6f for 48726@debbugs.gnu.org; Sun, 30 May 2021 14:54:37 -0400 Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.west.internal (Postfix) with ESMTP id 09AE3ED0; Sun, 30 May 2021 14:54:29 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Sun, 30 May 2021 14:54:30 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=carldong.me; h= content-type:mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; s=fm1; bh=c /P4JVKbM5MW01m27pF0p87qceRm0dssoNy9j8IjyL4=; b=PfOm11OSUlX+qGJkq 6Bn52QPetZRCvwUxJJ2jH+p3ReTw3tWjja+vx/w29ULONaEDYtoa27FfrIs1DQwm zXxT0v4UJQbrLb42QkH7UT3gMySpoVskJ3UjXHsZECpgJWLkEKqUyqBZEeSDp9wk wZkmJzqWk5UihPAX6u/n8O0TPIC7Uzj8gGexAoe3M5JC+ZgJli+PSvnzj8BpMBp/ xAQjhluRgaaZBToj4Iq7bIVOH2cWfR6XDo7ibagDshbl302TPTAMbXYFL8iLEutb wXak2ZoaYEpyuOKyNFU1obQCz5rhFi1OhyR9XM5JqErs9bUfclUCR4W8OW65R0ij dEGIA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; bh=c/P4JVKbM5MW01m27pF0p87qceRm0dssoNy9j8Ijy L4=; b=n2mxOeJnw6d2yKelq7iJqHbdUWMcgmjlWHyEZgKsleVnqXCsN0FaQ+wgf 29aNt6pg8GX0eHnxGjZRdc/qYlI/l9bP1Vzyk4Ne8ue3mV4PsdRIUeSdTbr8SFpA c/fjUtxFk/IhFYQzY3z6QmQKe7WaLBxgvKCWB4oCcWidyupiOHEJe+hiIvfgUIB/ yDLljuGR72DhR6VE4RnalWNC2mFCOv3W7hftEOiHvz8iWINFnYUgieA/sntNaihA KmBLJkUYay/cc24qXW62xKCbbso1rcJPC/sdFNS0msLsn/LGg1gITA1Eit+hsBsL KeVig7Zh+zt28CD0MNe5dMBvGxhlg== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrvdeluddgudeftdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpegtggfuhfgjfffgkfhfvffosehtqhhmtdhhtdejnecuhfhrohhmpeevrghr lhcuffhonhhguceotghonhhtrggtthestggrrhhlughonhhgrdhmvgeqnecuggftrfgrth htvghrnhepteekgeettedvheeuieejhfelgfdtffeiiedvudeuffehvdegvdevudeufedu lefgnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucfkphepvddthedrvddvtddrud dvkedruddtvdenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhr ohhmpegtohhnthgrtghtsegtrghrlhguohhnghdrmhgv X-ME-Proxy: Received: from [172.19.248.116] (unknown [205.220.128.102]) by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 30 May 2021 14:54:25 -0400 (EDT) Content-Type: text/plain; charset=utf-8 Mime-Version: 1.0 (Mac OS X Mail 13.4 \(3608.120.23.2.7\)) From: Carl Dong In-Reply-To: <0aad0d5c40ba12167b33ae3acbf470acbd634018.camel@telenet.be> Date: Sun, 30 May 2021 18:54:16 +0000 Content-Transfer-Encoding: quoted-printable Message-Id: <9D30C8ED-39FE-4B1A-A2BA-2D9FB9BB620E@carldong.me> References: <20210529053107.381628-1-contact@carldong.me> <0aad0d5c40ba12167b33ae3acbf470acbd634018.camel@telenet.be> X-Mailer: Apple Mail (2.3608.120.23.2.7) X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Maxime, > One question: does upstream know about the patch? Yup! In fact it=E2=80=99s already merged: = https://github.com/kichik/nsis/pull/13 > If accepted upstream, then other distro's will automatically > be a little more reproducible as well. In the mean time > (or if the patch isn't accepted upstream) we can patch nsis in guix. There=E2=80=99s no release with this patch yet, so I think we should = patch it in guix for now and remove the patch once a release comes out = with this patch included. Cheers, Carl Dong contact@carldong.me "I fight for the users"= From unknown Fri Aug 15 17:19:26 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#48726] [PATCH] gnu: nsis: Respect SOURCE-DATE-EPOCH for reproducibility Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 01 Jun 2021 21:20:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48726 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Carl Dong Cc: 48726@debbugs.gnu.org Received: via spool by 48726-submit@debbugs.gnu.org id=B48726.16225823738540 (code B ref 48726); Tue, 01 Jun 2021 21:20:01 +0000 Received: (at 48726) by debbugs.gnu.org; 1 Jun 2021 21:19:33 +0000 Received: from localhost ([127.0.0.1]:38051 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loBnR-0002Dg-DH for submit@debbugs.gnu.org; Tue, 01 Jun 2021 17:19:33 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34384) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loBnP-0002DT-Fg for 48726@debbugs.gnu.org; Tue, 01 Jun 2021 17:19:32 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:47528) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1loBnK-0002Sm-84; Tue, 01 Jun 2021 17:19:26 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=57882 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1loBnJ-0004GW-W8; Tue, 01 Jun 2021 17:19:26 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <20210529053107.381628-1-contact@carldong.me> Date: Tue, 01 Jun 2021 23:19:23 +0200 In-Reply-To: <20210529053107.381628-1-contact@carldong.me> (Carl Dong's message of "Sat, 29 May 2021 01:31:07 -0400") Message-ID: <87im2xz3j8.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi, Carl Dong skribis: > * gnu/packages/patches/nsis-SConstruct-sde-support.patch: New patch. > * gnu/packages/installers.scm (make-nsis)[source]: Apply it. Nice! Minor issues: > gnu/packages/installers.scm | 3 ++- > .../patches/nsis-SConstruct-sde-support.patch | 15 +++++++++++++++ How about =E2=80=98nsis-source-date-epoch.patch=E2=80=99? It might be slig= htly clearer in my view. Please make sure to add it to =E2=80=98gnu/local.mk=E2=80=99. > 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 Please add a line at the top saying what it does and linking to the upstream issue (or =E2=80=98guix lint=E2=80=99 will complain, which would b= e so bad :-)). OK to push with these changes, thank you! Ludo=E2=80=99. From unknown Fri Aug 15 17:19:26 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#48726] [PATCH v2] gnu: nsis: Respect SOURCE-DATE-EPOCH for reproducibility Resent-From: Carl Dong Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 03 Jun 2021 19:47:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48726 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: ludo@gnu.org Cc: 48726@debbugs.gnu.org, Carl Dong Received: via spool by 48726-submit@debbugs.gnu.org id=B48726.16227495965321 (code B ref 48726); Thu, 03 Jun 2021 19:47:02 +0000 Received: (at 48726) by debbugs.gnu.org; 3 Jun 2021 19:46:36 +0000 Received: from localhost ([127.0.0.1]:44695 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lotIa-0001Nl-90 for submit@debbugs.gnu.org; Thu, 03 Jun 2021 15:46:36 -0400 Received: from wout1-smtp.messagingengine.com ([64.147.123.24]:58587) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lotIY-0001NX-Dr for 48726@debbugs.gnu.org; Thu, 03 Jun 2021 15:46:35 -0400 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.west.internal (Postfix) with ESMTP id 49B4CCB7; Thu, 3 Jun 2021 15:46:28 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Thu, 03 Jun 2021 15:46:28 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=carldong.me; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm1; bh=2jcWAhO+2TtKA Wr+xQCtEXMbdwR5bwvofA7l5h00R5g=; b=li7reL3hAQQxGjbPbWrvz642YoXLW nPdLLC9r6v8VGbtrv6Xwbkgnb3pmSkmC7+KeKiHU17+O2+3echg1bS9/biMbMCCh 2tcFK0LQ/W7CGoYi5rpBEwVwhhtV2kU6PW8sCKFmSv6Z+b2CsWtlpLViqeOT2X4t UlKkhMMEPVTf4tkj2FpFllMehPFdsclrMnGX4YsFrt7EixuhVXgkzi4My5O+uEXl 2E0DjGBRRRXxUMVxUdajUlgG29ipVOrJgv9LRGztunjAbIphmtxXaI2be+LByY3o fxq07CHaehXTkZuMrIYX4vu+u0JAL4MWEcRga7vXHXDWBUr6vjMvbPIUA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; bh=2jcWAhO+2TtKAWr+xQCtEXMbdwR5bwvofA7l5h00R5g=; b=btTAqWuS 3amEO2csV6eIGU8doffmxZICLxDzTdXJpOCoNfvcSrVJ18BihOwJJv/shNXJLQkn htdIeJIN92HGGAMEBFy7G4NtiKA2jNpozg8MLClKgxVj2/bBi6O9RuEZfSRRIxVc SQ2IMuDpDkW2TUiJgZdzk8ev10hMjcDAhdmok260RscB4z62uwb5y8/pT7V16pDr IXEVlAKrIFeUQAGSA6b27Y9krEzfNUR19PgqihHbtRZg9BQiXDiO0upnco0pz5Je iNqsGcxTpY9GGcXxzxV6d+cyBxiHgK1cM25fLtOdiFk5vBxIty0SZKianBSIfduA ZLqjuWp2qBd1IQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrvdelledgudegtdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpeevrghrlhcuffhonhhguceotghonhhtrggtthestggrrhhl ughonhhgrdhmvgeqnecuggftrfgrthhtvghrnhepheevvdelveduledtveegiefhvddtke evkeeuheevgeekjeekuedvveffgfefgfdtnecuffhomhgrihhnpehgihhthhhusgdrtgho mhdprhgvphhrohguuhgtihgslhgvqdgsuhhilhgushdrohhrghenucevlhhushhtvghruf hiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpegtohhnthgrtghtsegtrghrlhgu ohhnghdrmhgv X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 3 Jun 2021 15:46:27 -0400 (EDT) From: Carl Dong Date: Thu, 3 Jun 2021 15:46:08 -0400 Message-Id: <20210603194607.1101579-1-contact@carldong.me> X-Mailer: git-send-email 2.31.1 In-Reply-To: <87im2xz3j8.fsf@gnu.org> References: <87im2xz3j8.fsf@gnu.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Does this look correct? * gnu/packages/patches/nsis-source-date-epoch.patch: New patch. * gnu/packages/installers.scm (make-nsis)[source]: Apply it. --- gnu/local.mk | 1 + gnu/packages/installers.scm | 3 ++- .../patches/nsis-source-date-epoch.patch | 23 +++++++++++++++++++ 3 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/nsis-source-date-epoch.patch diff --git a/gnu/local.mk b/gnu/local.mk index 792ebac1e1..db96f55bf0 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1464,6 +1464,7 @@ dist_patch_DATA = \ %D%/packages/patches/network-manager-plugin-path.patch \ %D%/packages/patches/nginx-socket-cloexec.patch \ %D%/packages/patches/nsis-env-passthru.patch \ + %D%/packages/patches/nsis-source-date-epoch.patch \ %D%/packages/patches/nss-increase-test-timeout.patch \ %D%/packages/patches/nss-3.56-pkgconfig.patch \ %D%/packages/patches/ntfs-3g-CVE-2019-9755.patch \ diff --git a/gnu/packages/installers.scm b/gnu/packages/installers.scm index 775b91f0f7..c768a367aa 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-source-date-epoch.patch")))) (build-system scons-build-system) (native-inputs `(("xgcc" ,xgcc) ("xbinutils" ,xbinutils) diff --git a/gnu/packages/patches/nsis-source-date-epoch.patch b/gnu/packages/patches/nsis-source-date-epoch.patch new file mode 100644 index 0000000000..744c2a8011 --- /dev/null +++ b/gnu/packages/patches/nsis-source-date-epoch.patch @@ -0,0 +1,23 @@ +Honour SOURCE_DATE_EPOCH for VERSION default + +Merged upstream as cd3f1024a37a332f1d4fa96a817ca80dfa2a478c, but not yet in a +release. GitHub PR: https://github.com/kichik/nsis/pull/13 + +Python snippet from: https://reproducible-builds.org/docs/source-date-epoch/#python + + +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() + -- 2.31.1 From unknown Fri Aug 15 17:19:26 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#48726] [PATCH v2] gnu: nsis: Respect SOURCE-DATE-EPOCH for reproducibility Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 04 Jun 2021 15:40:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48726 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Carl Dong Cc: 48726@debbugs.gnu.org Received: via spool by 48726-submit@debbugs.gnu.org id=B48726.162282118132508 (code B ref 48726); Fri, 04 Jun 2021 15:40:01 +0000 Received: (at 48726) by debbugs.gnu.org; 4 Jun 2021 15:39:41 +0000 Received: from localhost ([127.0.0.1]:47760 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lpBvA-0008SE-Qd for submit@debbugs.gnu.org; Fri, 04 Jun 2021 11:39:41 -0400 Received: from eggs.gnu.org ([209.51.188.92]:44630) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lpBv9-0008Ro-Cq for 48726@debbugs.gnu.org; Fri, 04 Jun 2021 11:39:39 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:38400) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lpBv3-0006ow-Ou; Fri, 04 Jun 2021 11:39:34 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=43722 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lpBv3-0005hi-Gl; Fri, 04 Jun 2021 11:39:33 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <87im2xz3j8.fsf@gnu.org> <20210603194607.1101579-1-contact@carldong.me> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 16 Prairial an 229 de la =?UTF-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Fri, 04 Jun 2021 17:39:31 +0200 In-Reply-To: <20210603194607.1101579-1-contact@carldong.me> (Carl Dong's message of "Thu, 3 Jun 2021 15:46:08 -0400") Message-ID: <87a6o5prkc.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Carl Dong skribis: > Does this look correct? > > * gnu/packages/patches/nsis-source-date-epoch.patch: New patch. > * gnu/packages/installers.scm (make-nsis)[source]: Apply it. You should mention gnu/local.mk in the commit log, but apart from that, it LGTM! Thanks, Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 08 11:50:11 2021 Received: (at control) by debbugs.gnu.org; 8 Jun 2021 15:50:11 +0000 Received: from localhost ([127.0.0.1]:59562 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lqdzX-0002nh-Hr for submit@debbugs.gnu.org; Tue, 08 Jun 2021 11:50:11 -0400 Received: from wout5-smtp.messagingengine.com ([64.147.123.21]:45549) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lqdzR-0002my-PA for control@debbugs.gnu.org; Tue, 08 Jun 2021 11:50:09 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id E457E1A96 for ; Tue, 8 Jun 2021 11:49:58 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Tue, 08 Jun 2021 11:49:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=carldong.me; h= from:content-type:content-transfer-encoding:mime-version:subject :message-id:date:to; s=fm1; bh=Aj9kDtd8mVgpUnAsPuqtRokv5Ud9uaCz7 8w45vPr2sQ=; b=O2UCSPpfoOtkQ+DdwVQnj6ynE48YUelXzRQW9SMla1zjo7T3F Gj2/ZZ0iSfY8aBL6MdB6zPNNP+Y+/OO1l0KLKj/r2TySNZduFObGCc7rsbQw8tdo QjGr6mO30mLJM407Ncr24ZpP559kIDkIsxGemWRqblNLolQOnkZpQW5Ia+gqe2zX 1Rif6mlGucKf4dJjlg4e1or+tBrk9iy/nJLCSLYr/5TqUGHIMiQBgwD4jHt+TX5/ Wpmq+NKF2h+lFHJDErWS+cMR+P0f2xhTe2qauCB1WGGhBCE53C7bYuE0YPHwOrM8 EIHulwOuJx1gWuGS7rKhj2UHbkjiodAOcj+UA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:content-type :date:from:message-id:mime-version:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=Aj9kDt d8mVgpUnAsPuqtRokv5Ud9uaCz78w45vPr2sQ=; b=RZuadPODFgCHS/UOPN3+Gu r1CzZ4MQnBQ1X+SyRiqyY7xPPWRCaLyK7Mtt2GA2UdkJtOdVle7ikJcvxvO/NsWP bmWjqdYI6/bhLaVaANHeYWuRtjkNe7YqxQL1lZydp9zVYQ1wSKDvkhneXalRTaqI /J/r/1EMpyDhdg4VuxvSCzqdKIKGkTZ/f66YpnEFLoaM/OQ3kPKj5sioN/1xlZxx Ky60X0VC3FodeMse/qB54N2e1l8mzNVKIwRxcL85pMABe61myrZPw96ySgzUeZPE Q0VvY0THci6+qGjZq+WwzWceYMbW0xWth/njXsgl0n45ICQYMdmYJJfwvMosMlug == X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrfedtledgjeelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhtgfgggfukfffvffosehtjehmtd hhtddvnecuhfhrohhmpeevrghrlhcuffhonhhguceotghonhhtrggtthestggrrhhlugho nhhgrdhmvgeqnecuggftrfgrthhtvghrnheptddvfeelfeffueejgeelhfeitdekieetfe ethfffgeekveefjefhudetheegveefnecuvehluhhsthgvrhfuihiivgeptdenucfrrghr rghmpehmrghilhhfrhhomheptghonhhtrggtthestggrrhhlughonhhgrdhmvg X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Tue, 8 Jun 2021 11:49:58 -0400 (EDT) From: Carl Dong Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Mime-Version: 1.0 (Mac OS X Mail 13.4 \(3608.120.23.2.7\)) Subject: Closing 48726 Message-Id: <75D335F6-9DE1-4184-9AAF-B6166513F11D@carldong.me> Date: Tue, 8 Jun 2021 11:49:57 -0400 To: control@debbugs.gnu.org X-Mailer: Apple Mail (2.3608.120.23.2.7) X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) close 48726 20d9535e1bf981a37f39f171ad72f67cdb1e6919