[bug#73367] [PATCH 0/4] Update erlang, elixir and rebar3.

[bug#73367] [PATCH 0/4] Update erlang, elixir and rebar3.

[Igor Goryachev via Guix-patches via]

Here are updates for Erlang, Elixir and Rebar3 to recent versions.

Igor Goryachev (4):
  gnu: erlang: Update to 27.1.
  gnu: erlang: Fix build.
  gnu: rebar3: Update to 3.24.0, make reproducible.
  gnu: elixir: Update to 1.17.3.

 gnu/packages/elixir.scm                    | 12 ++++-
 gnu/packages/erlang.scm                    | 54 +++++++---------------
 gnu/packages/patches/erlang-man-path.patch |  8 ++--
 3 files changed, 31 insertions(+), 43 deletions(-)


base-commit: e85f52e826b0701c3dcf9acf9d81e5ae57aec8f9
-- 
2.46.0

[bug#73367] [PATCH 1/4] gnu: erlang: Update to 27.1.

[Igor Goryachev via Guix-patches via]

* gnu/packages/erlang.scm (erlang): Update to 27.1.
[native-inputs]: Fetch recent erlang-manpages.

Change-Id: I30b810fe900160c269a7c84e2a6860f630c988ad
---
 gnu/packages/erlang.scm | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/gnu/packages/erlang.scm b/gnu/packages/erlang.scm
index 175bbdf8a5..5d8516f311 100644
--- a/gnu/packages/erlang.scm
+++ b/gnu/packages/erlang.scm
@@ -49,7 +49,7 @@ (define-module (gnu packages erlang)
 (define-public erlang
   (package
     (name "erlang")
-    (version "27.0.1")
+    (version "27.1")
     (source (origin
               (method git-fetch)
               ;; The tarball from http://erlang.org/download contains many
@@ -61,25 +61,20 @@ (define-public erlang
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1gzlvbbc1zm87910pnhi94mcpag1zxylhy7m2g4vhlmclyir7gd1"))
+                "099m8z5f9mq6hqv75hv73iydzmnpylcagss4ysrk9xg732xqcawb"))
               (patches (search-patches "erlang-man-path.patch"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("perl" ,perl)
-
        ;; Erlang's documentation is distributed in a separate tarball.
        ("erlang-manpages"
-        ;; Manpages tarball is not released for 27.0.1, so we take it from the
-        ;; previous version. Details:
-        ;; https://erlangforums.com/t/patch-package-otp-27-0-1-released/3824/4
-        ,(let ((version "27.0"))
-           (origin
-             (method url-fetch)
-             (uri (string-append "https://github.com/erlang/otp/releases/download"
-                                 "/OTP-" version "/otp_doc_man_" version ".tar.gz"))
-             (sha256
-              (base32
-               "0f3w2152090860aci4a38d1bd19c5sslbwadwxc7sjza487fm8lm")))))))
+        ,(origin
+           (method url-fetch)
+           (uri (string-append "https://github.com/erlang/otp/releases/download"
+                               "/OTP-" version "/otp_doc_man_" version ".tar.gz"))
+           (sha256
+            (base32
+             "1d4v664z9z4d8sfp9304kflgmymbl74hcgjpbcqkbhzwcjk8jrn0"))))))
     (inputs
      (list ncurses openssl wxwidgets))
     (propagated-inputs
-- 
2.46.0

[bug#73367] [PATCH 2/4] gnu: erlang: Fix build.

[Igor Goryachev via Guix-patches via]

* gnu/packages/patches/erlang-man-path.patch: Adjust patch.

Change-Id: I2531c92001a3b1c2a3363615a7a1542904fa98b7
---
 gnu/packages/patches/erlang-man-path.patch | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/patches/erlang-man-path.patch b/gnu/packages/patches/erlang-man-path.patch
index 68fc9f45b4..e5beb4af1e 100644
--- a/gnu/packages/patches/erlang-man-path.patch
+++ b/gnu/packages/patches/erlang-man-path.patch
@@ -9,10 +9,10 @@ as other man pages.)
 
 --- a/erts/etc/common/erlexec.c
 +++ b/erts/etc/common/erlexec.c
-@@ -709,8 +709,10 @@
- 			error("-man not supported on Windows");
- #else
- 			argv[i] = "man";
+@@ -728,8 +728,10 @@ int main(int argc, char **argv)
+                                 break;
+                             }
+                         }
 -			erts_snprintf(tmpStr, sizeof(tmpStr), "%s/man", rootdir);
 -			set_env("MANPATH", tmpStr);
 +			/*
-- 
2.46.0

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

[Igor Goryachev via Guix-patches via]

* 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

[bug#73367] [PATCH 4/4] gnu: elixir: Update to 1.17.3.

[Igor Goryachev via Guix-patches via]

* gnu/packages/elixir.scm (elixir): Update to 1.17.3.
[arguments]<#:phases>: Add 'disable-some-logger-tests-for-erlang-27.1+ phase.

Change-Id: I1adf3a24656b291f57cfb29812cf034130552506
---
 gnu/packages/elixir.scm | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/elixir.scm b/gnu/packages/elixir.scm
index 895ede25dd..459e160830 100644
--- a/gnu/packages/elixir.scm
+++ b/gnu/packages/elixir.scm
@@ -41,7 +41,7 @@ (define-module (gnu packages elixir)
 (define-public elixir
   (package
     (name "elixir")
-    (version "1.17.2")
+    (version "1.17.3")
     (source
      (origin
        (method git-fetch)
@@ -50,7 +50,7 @@ (define-public elixir
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "063pfz6ljy22b4nyvk8pi8ggqb6nmzqcca08vnl3h9xgh1zzddpj"))
+        (base32 "171l6g304044yk6i0827hgl64vp122ygn1wa1xqdjhw08b5kl2pd"))
        (patches (search-patches "elixir-path-length.patch"))))
     (build-system gnu-build-system)
     (arguments
@@ -127,6 +127,14 @@ (define-public elixir
               (lambda* (#:key inputs #:allow-other-keys)
                 ;; Some tests require access to a home directory.
                 (setenv "HOME" "/tmp")))
+            ;; Temporarily skip several tests related to logger to pass
+            ;; under Erlang 27.1. For more info see:
+            ;; https://elixirforum.com/t/elixir-v1-17-3-released/66156/2
+            (add-before 'check 'disable-some-logger-tests-for-erlang-27.1+
+              (lambda _
+                (substitute* "lib/logger/test/logger/translator_test.exs"
+                  (("test \"translates Supervisor progress")
+                   "@tag :skip\n  test \"translates Supervisor progress"))))
             (delete 'configure)
             (add-after 'install 'wrap-programs
               (lambda* (#:key inputs outputs #:allow-other-keys)
-- 
2.46.0

bug#73367: [PATCH 0/4] Update erlang, elixir and rebar3.

[Andrew Tropin via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 797 bytes --]

On 2024-09-19 19:28, Igor Goryachev via Guix-patches via wrote:

> Here are updates for Erlang, Elixir and Rebar3 to recent versions.
>
> Igor Goryachev (4):
>   gnu: erlang: Update to 27.1.
>   gnu: erlang: Fix build.
>   gnu: rebar3: Update to 3.24.0, make reproducible.
>   gnu: elixir: Update to 1.17.3.
>
>  gnu/packages/elixir.scm                    | 12 ++++-
>  gnu/packages/erlang.scm                    | 54 +++++++---------------
>  gnu/packages/patches/erlang-man-path.patch |  8 ++--
>  3 files changed, 31 insertions(+), 43 deletions(-)
>
>
> base-commit: e85f52e826b0701c3dcf9acf9d81e5ae57aec8f9

Applied, built locally, pushed as
https://git.savannah.gnu.org/cgit/guix.git/commit/?id=60dfa7f673

Thank you for the update!

-- 
Best regards,
Andrew Tropin

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]