diff mbox series

[bug#73367,3/4] gnu: rebar3: Update to 3.24.0, make reproducible.

Message ID 2541ae31df2001548d1ebd91ecb3b34155408fdf.1726763309.git.igor@goryachev.org
State New
Headers show
Series Update erlang, elixir and rebar3. | expand

Commit Message

Igor Goryachev Sept. 19, 2024, 4:39 p.m. UTC 
* 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 mbox series

Patch

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))