From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id kKVwMSVU7GajgwEA62LTzQ:P1 (envelope-from ) for ; Thu, 19 Sep 2024 16:41:09 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id kKVwMSVU7GajgwEA62LTzQ (envelope-from ) for ; Thu, 19 Sep 2024 18:41:09 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=WrnlOp9I; dkim=fail ("headers rsa verify failed") header.d=goryachev.org header.s=dkim header.b=QFDw14XE; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1726764069; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=2SYTBPWG85IlcV4dW8WXHTqlUUAvzwS596DgteBIInc=; b=Po1GXA65Tfr48CMEd7b1aYkjGc1yBAu6K4bbou5Wt73LObr64ZZzQLCQMrPKi+hM4Xpnvr Mou1W6sv12UJ3bvGD8LulOck/heVfvGXLPQbSljT7Io2yXjBOyV5+n+fKvPUgxejNo7Utb 9Q+Qx2xuEkiNLJUUSHqy7+RgzBi87NQiptUoyzOu4slgGy6fBZaefAzLSgYVH2RUc5HnNN W/qGNUeRz9vc4LS6REfIQifZ9cheQuzwnDvMfI2F7iKUJbMP2wWna9o4VC8fuffy2YLO9w edCAR2drep3Iz66hIOWcu3YvT3NbwoBM2vcDWfK0LSRa5Ho85hzVBQkcoFWh8Q== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=WrnlOp9I; dkim=fail ("headers rsa verify failed") header.d=goryachev.org header.s=dkim header.b=QFDw14XE; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1726764069; a=rsa-sha256; cv=none; b=IWyYNgHD1stsCiZTi3bRunWfRisVVsWV+pW28yemUumHSu5e4GqCje6k7kNQl72aP59T6m NkXjAv1MZKAC3mJlMZIQxirhDpWD/TigGf6pJxENf9bJPt74pZUtReqwTBkDqePQx/R9ef rYxR62Hk7aFtO4IHMGw3mDJitz5/EosL46hAD8kw7MgnzOisptIpciwdNxoMeSyxmek3Zi PR/aA8ttO7WvQ6qvUSF2R5SZ0TMRXWqDFIgpX25ca7BB4MUJR32l56V0jF40LR++qNPebU QgMIKwDIuiH0IYq/BYiIu3zXkarT6EDfaCWbUWvdllCTH7PvN+K+WsMHQXOiSQ== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id A056B76B27 for ; Thu, 19 Sep 2024 18:41:09 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1srKD2-0003zY-UH; Thu, 19 Sep 2024 12:40:48 -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 ) id 1srKD0-0003yb-4s for guix-patches@gnu.org; Thu, 19 Sep 2024 12:40:46 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1srKCz-0001Sw-OI for guix-patches@gnu.org; Thu, 19 Sep 2024 12:40:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=2SYTBPWG85IlcV4dW8WXHTqlUUAvzwS596DgteBIInc=; b=WrnlOp9I+7U8GJIoc+fNVzWTOYzCb3c+mFZ1G+gZnyMmeLWI9Q3YEJEL8OfovmogMIpwy8tCeC+W60ETWUanoIBWH7ipZOMNnJFkgpUMNsdWggOuZRl2ICA719vP2yIuDG43ahKWp0uSMUujfxq7fKWa/w4wr4G+PiPU5XutRsiUH92LKEBIMYGzsSwsy7jtoEk+twi9eKIDuZBPhxz/l1/BZ+lVwQjzqIZBCpPSBpwcQb/g6VwF9mBKLXQQ71EbhOX/iQ1W71tOfq2Ol/gE6Tt6JKWzdCdt9mw+0mso/nTuE1XOMSKarW9+30IWpR3zPm+n6ih8xl4oMXlx+LnCJA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1srKDH-0001iM-Bh for guix-patches@gnu.org; Thu, 19 Sep 2024 12:41:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73367] [PATCH 3/4] gnu: rebar3: Update to 3.24.0, make reproducible. Resent-From: Igor Goryachev Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 19 Sep 2024 16:41:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73367 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73367@debbugs.gnu.org Cc: Igor Goryachev , Andrew Tropin Received: via spool by 73367-submit@debbugs.gnu.org id=B73367.17267640456536 (code B ref 73367); Thu, 19 Sep 2024 16:41:03 +0000 Received: (at 73367) by debbugs.gnu.org; 19 Sep 2024 16:40:45 +0000 Received: from localhost ([127.0.0.1]:33432 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1srKCy-0001hK-UD for submit@debbugs.gnu.org; Thu, 19 Sep 2024 12:40:45 -0400 Received: from mail.goryachev.org ([213.199.41.95]:54774) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1srKCs-0001gb-Vg for 73367@debbugs.gnu.org; Thu, 19 Sep 2024 12:40:39 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=dkim; bh=GyEcEfOd3kARjON +wGOI0zVdXJxxy4fsKeArIVlhxFg=; h=references:in-reply-to:date:subject: cc:to:from; d=goryachev.org; b=QFDw14XEbi8fojM9lDhGXYoUXo3vnKXk920gRRF fBwvIPAsMQ9czrDwWRFQ5ad8YlVmkA7xG3dnSb6zi6CLKO/IhYddzpekGM38c/LC0APoNa 7qrBsjcqqLCa2lrJ5mXf9YIAaPOIjtGCLTzBRTKBpXLAK3huwXePVvqGRG2HMg= Received: by mail.goryachev.org (OpenSMTPD) with ESMTPSA id 5f086806 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Thu, 19 Sep 2024 16:40:18 +0000 (UTC) Date: Thu, 19 Sep 2024 19:39:12 +0300 Message-ID: <2541ae31df2001548d1ebd91ecb3b34155408fdf.1726763309.git.igor@goryachev.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: , Reply-to: Igor Goryachev X-ACL-Warn: , Igor Goryachev via Guix-patches From: Igor Goryachev via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -4.41 X-Spam-Score: -4.41 X-Migadu-Queue-Id: A056B76B27 X-Migadu-Scanner: mx10.migadu.com X-TUID: vFUSgUcEbZ1t * gnu/packages/erlang.scm (rebar3): Update to 3.24.0. [arguments]<#:phases>: Modify 'make-escriptize-reproducible phase. Change-Id: I264515753f1ed0bdabdc4042a1c850d738c27738 --- gnu/packages/erlang.scm | 31 ++++++++----------------------- 1 file changed, 8 insertions(+), 23 deletions(-) diff --git a/gnu/packages/erlang.scm b/gnu/packages/erlang.scm index 5d8516f311..026a7dd32e 100644 --- a/gnu/packages/erlang.scm +++ b/gnu/packages/erlang.scm @@ -637,7 +637,7 @@ (define-public erlang-ssl-verify-fun (define-public rebar3 (package (name "rebar3") - (version "3.23.0") + (version "3.24.0") (source (origin (method git-fetch) @@ -646,7 +646,7 @@ (define-public rebar3 (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0jinjx3mk5j1kczxmblixbvhf24q0yfwih2ggs11x5ykmrqpbckl")))) + (base32 "1l73csyzxwinhrcsyb8hg2003v35yz6pv98inl3wg1j5587f071s")))) (build-system gnu-build-system) ;; TODO: remove vendored modules, install man-page, install lib(?) (arguments @@ -672,29 +672,14 @@ (define-public rebar3 "eunit_formatters" "getopt" "hex_core" "erlware_commons" "parse_trans" "relx" "ssl_verify_fun" "providers")))) (delete 'configure) - ;; By default rebar3 produces escripts with embedded ZIP archives - ;; with files with current timestamps which is not suitable for - ;; reproducible builds. We fix it by setting predefined timestamps. + ;; Due to changes in Erlang 27.1 related to handling ZIP-archives + ;; we still need to patch rebar to make it generate reproducible + ;; escripts. (add-before 'build 'make-escriptize-reproducible (lambda _ - (let ((escriptize "apps/rebar/src/rebar_prv_escriptize.erl")) - (substitute* escriptize - (("\\[dir_entries\\(filename:dirname\\(Filename1\\)\\),") - (string-append "FilePath = filename:join(Dir, Filename)," - "{ok, FileInfo0} = file:read_file_info(FilePath)," - "DateTime = {{1970, 1, 1}, {0, 0, 1}}," - "FileInfo = FileInfo0#file_info{mtime = DateTime}," - "[dir_entries(filename:dirname(Filename1)),"))) - (substitute* escriptize - (((string-append - "\\{Filename1, file_contents\\(filename:join\\(Dir, " - "Filename\\)\\)\\}\\].")) - "{Filename1, file_contents(FilePath), FileInfo}].")) - (substitute* escriptize - (((string-append "\\[\\{FName,FBin\\} \\|\\| \\{FName,FBin\\} <- " - "Files, FBin =/= <<>>\\]\\.")) - (string-append "[{FName,FBin,FInfo} || {FName,FBin,FInfo} <- " - "Files, FBin =/= <<>>].")))))) + (substitute* "apps/rebar/src/rebar_prv_escriptize.erl" + (("mtime = DateTime") + "atime = DateTime,ctime = DateTime,mtime = DateTime")))) (replace 'build (lambda _ (setenv "HOME" (getcwd)) -- 2.46.0