From debbugs-submit-bounces@debbugs.gnu.org Wed Aug 07 04:19:19 2024 Received: (at submit) by debbugs.gnu.org; 7 Aug 2024 08:19:19 +0000 Received: from localhost ([127.0.0.1]:33603 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sbbt9-0004Xi-7i for submit@debbugs.gnu.org; Wed, 07 Aug 2024 04:19:19 -0400 Received: from lists.gnu.org ([209.51.188.17]:54930) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sbbt5-0004XX-UX for submit@debbugs.gnu.org; Wed, 07 Aug 2024 04:19:17 -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 1sbbsg-0000kJ-Pp for guix-patches@gnu.org; Wed, 07 Aug 2024 04:18:50 -0400 Received: from mail.goryachev.org ([178.62.244.128]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sbbsf-0006vv-5C for guix-patches@gnu.org; Wed, 07 Aug 2024 04:18:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=dkim; bh=xy/m+hP2hr22t1S UUf2gn1pTknkVe4foVdN2fo+eEN0=; h=date:subject:cc:to:from; d=goryachev.org; b=KiGo6rSrvUuIdJTHJMF0aOSuXcKlvs8zJ1KC+o7mWG2cnvYS4eu +nV1y0/8CjVGEbBDWdte8K2lo3waiurWtZAf9jJI3xMuNFSSHc+SdIXu4k+r6XLAwgYR2U 3zbrZD+JgAHx74BxSD4eD3+JFD7/2+ikv3b1ldxtQ3WMdbWNxk= Received: by mail.goryachev.org (OpenSMTPD) with ESMTPSA id a140d30d (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Wed, 7 Aug 2024 08:18:44 +0000 (UTC) From: Igor Goryachev To: guix-patches@gnu.org Subject: [PATCH 0/5] Erlang update to 27.0.1. Date: Wed, 7 Aug 2024 11:10:57 +0300 Message-ID: X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=178.62.244.128; envelope-from=igor@goryachev.org; helo=mail.goryachev.org X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=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.3 (-) X-Debbugs-Envelope-To: submit Cc: Igor Goryachev 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.3 (--) Erlang package was cleaned up, updated to version 27.0.1 and several fixes/hacks were performed to make it deterministic by modifying its bootstrap. Igor Goryachev (5): gnu: erlang-jsx: Fix tests under Erlang 27+. gnu: erlang-yamerl: Update to 0.10.0.a24f448. gnu: erlang-jose: Relax build options. gnu: ejabberd: Include jiffy dependence under Erlang 27. gnu: erlang: Update to 27.0.1. gnu/packages/erlang-xyz.scm | 12 +++++ gnu/packages/erlang.scm | 91 +++++++++++++++++++++---------------- gnu/packages/messaging.scm | 3 ++ 3 files changed, 68 insertions(+), 38 deletions(-) base-commit: 5e567587dd4abf51f9a6fa44f5a852dde1115ce9 -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Wed Aug 07 04:24:31 2024 Received: (at 72508) by debbugs.gnu.org; 7 Aug 2024 08:24:31 +0000 Received: from localhost ([127.0.0.1]:33610 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sbbyA-0004jX-Vx for submit@debbugs.gnu.org; Wed, 07 Aug 2024 04:24:31 -0400 Received: from mail.goryachev.org ([178.62.244.128]:42954) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sbby8-0004jA-8l for 72508@debbugs.gnu.org; Wed, 07 Aug 2024 04:24:29 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=dkim; bh=MAmk9nnflEYtrft Z3CCdLozIrO1JhH7Z+aClS6dBq2k=; h=references:in-reply-to:date:subject: cc:to:from; d=goryachev.org; b=WioVWlRjhGdLvJaL2piY6hQp0gLfAa4/M/DVe92 8Jrd/ue2VrXdtg6x9VwLokuWvCK5331/BrkfQsCbb7PDyWDhPE9vD6TuBxvsZdzIV3IIaQ EedCUSE14bM+rfko6Ozfpdakms825i1DAQB026FH/s9qfeMl7SuVBdVHupG3cw= Received: by mail.goryachev.org (OpenSMTPD) with ESMTPSA id acc69508 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Wed, 7 Aug 2024 08:24:02 +0000 (UTC) From: Igor Goryachev To: 72508@debbugs.gnu.org Subject: [PATCH 1/5] gnu: erlang-jsx: Fix tests under Erlang 27+. Date: Wed, 7 Aug 2024 11:23:47 +0300 Message-ID: <1234c6aa24e573044ed2075cd712e22431b60897.1723018213.git.igor@goryachev.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 72508 Cc: Igor Goryachev , Andrew Tropin 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.0 (-) * gnu/packages/erlang.scm (erlang-jsx): Fix tests under Erlang 27+. Change-Id: Iaade94de64b5e5837a6a54376ba946c20d7107b9 --- gnu/packages/erlang.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/gnu/packages/erlang.scm b/gnu/packages/erlang.scm index b6a31f26e9..60d644ab8d 100644 --- a/gnu/packages/erlang.scm +++ b/gnu/packages/erlang.scm @@ -541,6 +541,16 @@ (define-public erlang-jsx (base32 "1wr7jkxm6nlgvd52xhniav64xr9rml2ngb35rwjwqlqvq7ywhp0c")))) (build-system rebar-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; Fix tests for running under Erlang 27+. + (add-after 'unpack 'fix-tests-for-erlang-27 + (lambda _ + (substitute* "src/jsx_decoder.erl" + (("\\{\"-0\\.0\", \\[\\{float, 0\\.0\\}, end_json\\], <<\"-0\\.0\">>\\},") + "{\"0.0\", [{float, 0.0}, end_json], <<\"0.0\">>}, +{\"-0.0\", [{float, -0.0}, end_json], <<\"-0.0\">>},"))))))) (synopsis "Streaming, evented JSON parsing toolkit") (description "An Erlang application for consuming, producing and manipulating json.") -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Wed Aug 07 04:24:31 2024 Received: (at 72508) by debbugs.gnu.org; 7 Aug 2024 08:24:31 +0000 Received: from localhost ([127.0.0.1]:33613 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sbbyB-0004je-BX for submit@debbugs.gnu.org; Wed, 07 Aug 2024 04:24:31 -0400 Received: from mail.goryachev.org ([178.62.244.128]:42954) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sbby9-0004jA-Bs for 72508@debbugs.gnu.org; Wed, 07 Aug 2024 04:24:29 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=dkim; bh=RAJtZ5kGyQzCJWB lmExdP2dVogSHwyljoeMj3VSyUyE=; h=references:in-reply-to:date:subject: cc:to:from; d=goryachev.org; b=DH3oGiDOXEMByfkKw6YPKu1i5wuvtLoccKH6OQ5 7PHXKY/8SfzRySZsw6YCbXzrLQPNzJjWzUIPlYRR5U2ofqiK18I5rVJhUaS0lSxfaKvhXb xCQKpbLFNemx2cJVqo9vbI6jvzgMmlkYNChG5mJitw7U7Xjk6jXqfG4Fxs0kM0= Received: by mail.goryachev.org (OpenSMTPD) with ESMTPSA id d5f6d8bf (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Wed, 7 Aug 2024 08:24:02 +0000 (UTC) From: Igor Goryachev To: 72508@debbugs.gnu.org Subject: [PATCH 2/5] gnu: erlang-yamerl: Update to 0.10.0.a24f448. Date: Wed, 7 Aug 2024 11:23:48 +0300 Message-ID: <8822eed8d9c94d833dc067e5aabf1271aaa7a8e5.1723018213.git.igor@goryachev.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 72508 Cc: Igor Goryachev , Andrew Tropin 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.0 (-) * gnu/packages/erlang.scm (erlang-yamerl): Update to 0.10.0.a24f448. Change-Id: Ib279881ff14e6e46ef639c1bcbc53706fa55aef6 --- gnu/packages/erlang.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/erlang.scm b/gnu/packages/erlang.scm index 60d644ab8d..2452fd88ab 100644 --- a/gnu/packages/erlang.scm +++ b/gnu/packages/erlang.scm @@ -292,17 +292,18 @@ (define-public erlang-cf (define-public erlang-yamerl (package (name "erlang-yamerl") - (version "0.10.0") + (version "0.10.0.a24f448") (source (origin (method git-fetch) (uri (git-reference ;; There are no tests included on Hex. (url "https://github.com/yakaz/yamerl") - (commit (string-append "v" version)))) + ;; Fetching commit which includes Erlang 27+ related fixes. + (commit "a24f448c0a8084f70b751dc38621047e56fb53cc"))) (file-name (git-file-name name version)) (sha256 - (base32 "0if8abgmispcfk7zhd0a5dndzwzbsmqrbyrm5shk375r2dbbwak6")))) + (base32 "1csq0z4igyybjgmrynz4d49ysv437iyd2xzkhifb5x47lpdpfpkq")))) (build-system rebar-build-system) (synopsis "YAML and JSON parser in pure Erlang") (description -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Wed Aug 07 04:24:32 2024 Received: (at 72508) by debbugs.gnu.org; 7 Aug 2024 08:24:32 +0000 Received: from localhost ([127.0.0.1]:33616 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sbbyB-0004jm-N3 for submit@debbugs.gnu.org; Wed, 07 Aug 2024 04:24:32 -0400 Received: from mail.goryachev.org ([178.62.244.128]:42954) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sbbyA-0004jA-27 for 72508@debbugs.gnu.org; Wed, 07 Aug 2024 04:24:30 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=dkim; bh=MmsUzYeBKBrqHV/ azxyQZV6wh6s7stLFg3eaa3a38Yc=; h=references:in-reply-to:date:subject: cc:to:from; d=goryachev.org; b=gLSKBA9U9oWPxVX1a/+IoepwMvRsMPQCWpPRhPc Uq7OxjI7uvvhxSeCam5LPk4MyrBJ8j4sBS/wq6NpNOljfsvsBwSvySyiQXWUkXpCktXmcH lVa9NIY0nb30tg6xeC+4/RgiPbCtS+Ds2x2cxGHLbb1XuuC4eso7zT9Ajr25oU= Received: by mail.goryachev.org (OpenSMTPD) with ESMTPSA id 68d205b6 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Wed, 7 Aug 2024 08:24:03 +0000 (UTC) From: Igor Goryachev To: 72508@debbugs.gnu.org Subject: [PATCH 3/5] gnu: erlang-jose: Relax build options. Date: Wed, 7 Aug 2024 11:23:49 +0300 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 72508 Cc: Igor Goryachev , Andrew Tropin 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.0 (-) * gnu/packages/erlang-xyz.scm (erlang-jose): Relax build options. Change-Id: I0e90cb54558260aea07bc33a11a2ab56261a20bf --- gnu/packages/erlang-xyz.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/gnu/packages/erlang-xyz.scm b/gnu/packages/erlang-xyz.scm index 5661bf52dd..6f1c033aec 100644 --- a/gnu/packages/erlang-xyz.scm +++ b/gnu/packages/erlang-xyz.scm @@ -59,6 +59,18 @@ (define-public erlang-jose (sha256 (base32 "0576jdjygby37qmzrs8cm5l6n622b0mi3z28j6r4s5xsz1px6v0d")))) (build-system rebar-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + ;; Do not treat warnings as errors, for more info see: + ;; https://github.com/potatosalad/erlang-jose/issues/168 + (add-after 'unpack 'relax-build-options + (lambda _ + (substitute* "rebar.config" + (("debug_info,") "debug_info")) + (substitute* "rebar.config" + (("warnings_as_errors") ""))))))) (synopsis "JSON Object Signing and Encryption for Erlang and Elixir") (description -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Wed Aug 07 04:24:32 2024 Received: (at 72508) by debbugs.gnu.org; 7 Aug 2024 08:24:32 +0000 Received: from localhost ([127.0.0.1]:33618 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sbbyC-0004jt-3Y for submit@debbugs.gnu.org; Wed, 07 Aug 2024 04:24:32 -0400 Received: from mail.goryachev.org ([178.62.244.128]:42954) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sbbyA-0004jA-Pn for 72508@debbugs.gnu.org; Wed, 07 Aug 2024 04:24:31 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=dkim; bh=AlVpUFj/wWOz4Zl eXUyTptEZ0nSgaAkQb56v9n1sSsc=; h=references:in-reply-to:date:subject: cc:to:from; d=goryachev.org; b=amCgspsuWEZe4wK75owPAx8+jyXv95OAm/tTGqL TYLFdk1LvIFvg6IZF17irYHFYbGeEtdQpCWHvUtt52S5Wb0KVR6Ah0dcPCzbF+n60asKb1 2IGJicopc7z76PKoFauhF20KeJUGu1P8O533aeSpGz+yJZZw+yi9KLUN8bsuKo= Received: by mail.goryachev.org (OpenSMTPD) with ESMTPSA id e89f38c5 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Wed, 7 Aug 2024 08:24:03 +0000 (UTC) From: Igor Goryachev To: 72508@debbugs.gnu.org Subject: [PATCH 4/5] gnu: ejabberd: Include jiffy dependence under Erlang 27. Date: Wed, 7 Aug 2024 11:23:50 +0300 Message-ID: <193796d3558870733faaa4e97806f4f0dc3eed3f.1723018213.git.igor@goryachev.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 72508 Cc: Igor Goryachev , Andrew Tropin 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.0 (-) * gnu/packages/messaging.scm (ejabberd): Include jiffy dependence under Erlang 27. Change-Id: Id0b0e7acb8100b406a6c686227dd497e0d7434fd --- gnu/packages/messaging.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index fb80866791..da04c34636 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -3706,6 +3706,9 @@ (define-public ejabberd (substitute* "rebar.config" (("\\{copy, \"rel/files/erl\",") "%{copy, \"rel/files/erl\",")) + ;; It seems ejabberd still needs jiffy due to p1_acme. + (substitute* "rebar.config" + (("\\{if_version_below, \"27\",") "{if_version_below, \"30\",")) ;; Unpin pinned dependences. (substitute* "rebar.lock" ((",1\\}") ",0}")) -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Wed Aug 07 04:24:36 2024 Received: (at 72508) by debbugs.gnu.org; 7 Aug 2024 08:24:36 +0000 Received: from localhost ([127.0.0.1]:33620 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sbbyF-0004kL-LH for submit@debbugs.gnu.org; Wed, 07 Aug 2024 04:24:36 -0400 Received: from mail.goryachev.org ([178.62.244.128]:42954) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sbbyB-0004jA-FK for 72508@debbugs.gnu.org; Wed, 07 Aug 2024 04:24:32 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=dkim; bh=zpUXm3T9hzvey7Y MK2ZRg0EE5QB6a4ZALX15Oxmj/zs=; h=references:in-reply-to:date:subject: cc:to:from; d=goryachev.org; b=QrEjr5NUfb+MNrxL12r1Xe3hX0V7CgzhTLB+5jP ePtwNWLo2GaA8tMtDDHeQ++ouy2LblmC9JCAFx2KdRwbC3LdJvNXshjIg0bPhBeldhCmu6 dJE94TF5Y2gAFv/Fh3dbsEn5gnxECPkC3NQLj5KsiUq+21UOf6ck9rGqhJAqe8= Received: by mail.goryachev.org (OpenSMTPD) with ESMTPSA id f0d225be (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Wed, 7 Aug 2024 08:24:04 +0000 (UTC) From: Igor Goryachev To: 72508@debbugs.gnu.org Subject: [PATCH 5/5] gnu: erlang: Update to 27.0.1. Date: Wed, 7 Aug 2024 11:23:51 +0300 Message-ID: <5831ab6e1e6490ce4eb0baec92af915847813232.1723018213.git.igor@goryachev.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 72508 Cc: Igor Goryachev , Andrew Tropin 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.0 (-) * gnu/packages/erlang.scm (erlang): Update to 27.0.1. Change-Id: Ic603c441cc304ef460e2559c57d765d7e499aad5 --- gnu/packages/erlang.scm | 74 ++++++++++++++++++++++------------------- 1 file changed, 39 insertions(+), 35 deletions(-) diff --git a/gnu/packages/erlang.scm b/gnu/packages/erlang.scm index 2452fd88ab..793f311376 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 "26.2.5") + (version "27.0.1") (source (origin (method git-fetch) ;; The tarball from http://erlang.org/download contains many @@ -61,7 +61,7 @@ (define-public erlang (file-name (git-file-name name version)) (sha256 (base32 - "0hd4flm9x8254rcv8hj0hra5lh5n51vcpharxy2d1ph8059vfsmx")) + "1gzlvbbc1zm87910pnhi94mcpag1zxylhy7m2g4vhlmclyir7gd1")) (patches (search-patches "erlang-man-path.patch")))) (build-system gnu-build-system) (native-inputs @@ -69,13 +69,17 @@ (define-public erlang ;; Erlang's documentation is distributed in a separate tarball. ("erlang-manpages" - ,(origin - (method url-fetch) - (uri (string-append "https://github.com/erlang/otp/releases/download" - "/OTP-" version "/otp_doc_man_" version ".tar.gz")) - (sha256 - (base32 - "08ngil8578asjzmqa657l4zdy0cr0h9spkg88wp9kxl95bfyli8p")))))) + ;; 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"))))))) (inputs (list ncurses openssl wxwidgets)) (propagated-inputs @@ -84,6 +88,7 @@ (define-public erlang `(#:test-target "release_tests" #:configure-flags (list "--disable-saved-compile-time" + "--enable-deterministic-build" "--enable-dynamic-ssl-lib" "--enable-native-libs" "--enable-shared-zlib" @@ -106,34 +111,22 @@ (define-public erlang (time-utc->date (make-time time-utc 0 (string->number (getenv "SOURCE_DATE_EPOCH")))))) - (substitute* "lib/reltool/src/reltool_target.erl" - (("Date = date\\(\\),") - (string-append "Date = " - (date->string source-date-epoch - "'{~Y,~m,~d}',")))) - (substitute* "lib/reltool/src/reltool_target.erl" - (("Time = time\\(\\),") - (string-append "Time = " - (date->string source-date-epoch - "'{~H,~M,~S}',")))) - (substitute* '("lib/reltool/src/reltool_target.erl" - "lib/sasl/src/systools_make.erl") - (("date\\(\\), time\\(\\),") - (date->string source-date-epoch - "{~Y,~m,~d}, {~H,~M,~S},"))) (substitute* "lib/dialyzer/test/small_SUITE_data/src/gs_make.erl" (("tuple_to_list\\(date\\(\\)\\),tuple_to_list\\(time\\(\\)\\)") (date->string source-date-epoch - "tuple_to_list({~Y,~m,~d}), tuple_to_list({~H,~M,~S})"))) - (substitute* "lib/snmp/src/compile/snmpc_mib_to_hrl.erl" - (("\\{Y,Mo,D\\} = date\\(\\),") - (date->string source-date-epoch - "{Y,Mo,D} = {~Y,~m,~d},"))) - (substitute* "lib/snmp/src/compile/snmpc_mib_to_hrl.erl" - (("\\{H,Mi,S\\} = time\\(\\),") - (date->string source-date-epoch - "{H,Mi,S} = {~H,~M,~S},")))))) + "tuple_to_list({~Y,~m,~d}), tuple_to_list({~H,~M,~S})")))))) + ;; When compiling with 'deterministic' option the important meta + ;; information is still needed for some Erlang's dependants, such as + ;; Elixir. We make compiler to preserve it. + ;; For more info see: https://github.com/erlang/otp/issues/8602 + (add-after 'unpack 'preserve-source-meta + (lambda _ + (substitute* "lib/compiler/src/compile.erl" + (("\\[\\{source,Source\\} \\| Info0\\];") + "[{source,Source} | Info0]; + [_|_] = Source when IsDeterministic -> + [{source,Source} | Info0];")))) (add-after 'unpack 'patch-/bin/sh (lambda* (#:key inputs #:allow-other-keys) (let ((sh (search-input-file inputs "/bin/sh"))) @@ -160,10 +153,21 @@ (define-public erlang "lib/reltool/examples/display_args" "lib/reltool/examples/mnesia_core_dump_viewer" "lib/snmp/src/compile/snmpc.src" - "make/verify_runtime_dependencies" - "make/emd2exml.in")))) + "make/verify_runtime_dependencies")))) (substitute* escripts (("/usr/bin/env") (which "env")))))) + ;; Copy modified compiler to bootstrap. It is deterministic, but + ;; preserves 'source' meta information to be used by dependants + ;; of Erlang. + (add-after 'build 'copy-modified-compiler + (lambda _ + (copy-recursively "lib/compiler/ebin/compile.beam" + "bootstrap/lib/compiler/ebin/compile.beam"))) + ;; ... clean everything and rebuild with modified bootstrap. + (add-after 'copy-modified-compiler 'clean-and-make-again + (lambda _ + (invoke "make" "clean") + (invoke "make"))) (add-before 'configure 'set-erl-top (lambda _ (setenv "ERL_TOP" (getcwd)))) -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Wed Aug 07 11:49:44 2024 Received: (at submit) by debbugs.gnu.org; 7 Aug 2024 15:49:44 +0000 Received: from localhost ([127.0.0.1]:34966 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sbiv2-0002rc-07 for submit@debbugs.gnu.org; Wed, 07 Aug 2024 11:49:44 -0400 Received: from lists.gnu.org ([209.51.188.17]:46466) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sbiv0-0002rS-3K for submit@debbugs.gnu.org; Wed, 07 Aug 2024 11:49:42 -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 1sbiua-0000rD-Fa for guix-patches@gnu.org; Wed, 07 Aug 2024 11:49:16 -0400 Received: from out-170.mta0.migadu.com ([2001:41d0:1004:224b::aa]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sbiuX-0007HX-0V for guix-patches@gnu.org; Wed, 07 Aug 2024 11:49:16 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=trop.in; s=key1; t=1723045747; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=4oMEy2HjMcqSKOK0xQ99tIvV8y9HlOqt2fGtu2ZJ5ek=; b=dI4NphkPVb0k93TqPJdKXO8B8wL/+46roUUg/E8STKhcsLUEvdtTvsMTJPxgrvGdMEEbnx v7w0e4gxRSZ2QXU/36DfgT8r45a0B47wgaDn1kMFF7FW0NiFk6JbN5V6U+c05u+ZYZzRsX rfXfpe/7dCfDYA0HmSW45xW7MZDAtlLg8F9DOhVJ4G8947nVHcyoS5P4c2y7te05fe/kW8 lQHOi7WfWokv2nz9BUo3c/kwfY/3qOW4FDZYrPxAPbz89msMiD3weJszfIAty/sGd17i4K asDK0C4f0IaXiPwTf1OoS8Mg9ngKavrGpCbzdlPJjDh2zDTe4L8hd1gi3RXxpw== From: Andrew Tropin To: Igor Goryachev via Guix-patches via , 72508@debbugs.gnu.org Subject: Re: [bug#72508] [PATCH 2/5] gnu: erlang-yamerl: Update to 0.10.0.a24f448. In-Reply-To: <8822eed8d9c94d833dc067e5aabf1271aaa7a8e5.1723018213.git.igor@goryachev.org> References: <8822eed8d9c94d833dc067e5aabf1271aaa7a8e5.1723018213.git.igor@goryachev.org> Date: Wed, 07 Aug 2024 19:49:02 +0400 Message-ID: <87zfpowcy9.fsf@trop.in> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Migadu-Flow: FLOW_OUT Received-SPF: pass client-ip=2001:41d0:1004:224b::aa; envelope-from=andrew@trop.in; helo=out-170.mta0.migadu.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit Cc: Igor Goryachev 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.4 (--) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable On 2024-08-07 11:23, Igor Goryachev via Guix-patches via wrote: > * gnu/packages/erlang.scm (erlang-yamerl): Update to 0.10.0.a24f448. > > Change-Id: Ib279881ff14e6e46ef639c1bcbc53706fa55aef6 > --- > gnu/packages/erlang.scm | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/gnu/packages/erlang.scm b/gnu/packages/erlang.scm > index 60d644ab8d..2452fd88ab 100644 > --- a/gnu/packages/erlang.scm > +++ b/gnu/packages/erlang.scm > @@ -292,17 +292,18 @@ (define-public erlang-cf > (define-public erlang-yamerl > (package > (name "erlang-yamerl") > - (version "0.10.0") > + (version "0.10.0.a24f448") Take a look at package examples, with non-release version: https://git.savannah.gnu.org/cgit/guix.git/tree/gnu/packages/emacs.scm?h=3D= #n560 The revision starts at 0 and get increased every time commit value is updated. It resets to 0, when the version changes. Please, adjust to this style and send the whole series as v2. > (source > (origin > (method git-fetch) > (uri (git-reference > ;; There are no tests included on Hex. > (url "https://github.com/yakaz/yamerl") > - (commit (string-append "v" version)))) > + ;; Fetching commit which includes Erlang 27+ related fixes. > + (commit "a24f448c0a8084f70b751dc38621047e56fb53cc"))) > (file-name (git-file-name name version)) > (sha256 > - (base32 "0if8abgmispcfk7zhd0a5dndzwzbsmqrbyrm5shk375r2dbbwak6"))= )) > + (base32 "1csq0z4igyybjgmrynz4d49ysv437iyd2xzkhifb5x47lpdpfpkq"))= )) > (build-system rebar-build-system) > (synopsis "YAML and JSON parser in pure Erlang") > (description =2D-=20 Best regards, Andrew Tropin --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEKEGaxlA4dEDH6S/6IgjSCVjB3rAFAmazl24ACgkQIgjSCVjB 3rCvKQ/8D5jdw8jO8OCBv5/qa7vC/2U0xo29cn+yX0Sl4RVmyg9GKuHWTyVg7790 lsfIBtELI4lJWoET+oyc1nhO7TRxHdPaJlQBZiE7RCvGB6nN6Wqkrh5YpN8/cdak 0GCl/glBcCTeK7LOfYVLcNQLTzRvuXASNNRUXGcpz1ybgeogcM7fiD41jQsSIJwd DrXUKJ7E1GdBN2a+2zbgdQ8+Ij3gtliMA0luAje13+35fAPYbibFe6bsbgHDiPk3 f9jzpm3UPiRzkra/Ex2FmJAI1Ci/Bz5mui2kpxeVmXt8GfTiu6+GZuRf6LSKopPY DM91CQdeT5//lLaQuSGKK+pvC2UMlpuOLtuCzkOg5lu9HxM6S7VjEkPnkH0OaMYS zaDNwF8gl0aPcoDd8UEfD8Hacyqqx95meugemllcKQ0roDCYMW9pAdJjLLeW36IC MXm3YOtFqYBRoINbaTOQXQSBqCeWIQ/N82een/Cacrd5DbsAezaGy7iCmqfoj2oS 7+7sEvsKTdIMUE4K1wNljIU0uEjakqw1xRH/XCjrrhxR9yk2K+Tg5cKF1qbDCEYl qxgdTRdi/b3ZEzlffbOYCJS38e0vwCUZ9keV3Kryc+++0RCQvD50U/u19yT3Hd2u vxuH51m3pPImV9+e3B4rdCNReScfuoRdpRh+qlhJFTYSx0wuCBg= =ggpI -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Wed Aug 07 12:34:48 2024 Received: (at 72508) by debbugs.gnu.org; 7 Aug 2024 16:34:49 +0000 Received: from localhost ([127.0.0.1]:35020 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sbjce-00045c-FC for submit@debbugs.gnu.org; Wed, 07 Aug 2024 12:34:48 -0400 Received: from mail.goryachev.org ([178.62.244.128]:57114) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sbjcd-00045T-0c for 72508@debbugs.gnu.org; Wed, 07 Aug 2024 12:34:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=dkim; bh=z9ft2NCbWMTOc9M oJVAveG2Wk11VkulFasobTfMvzWg=; h=date:subject:cc:to:from; d=goryachev.org; b=g78ql2d61PUT73Rvrl2TQielt2TNXUomzeHNBHjYwk1k8Fy5bjX /NUDkpEIxD33L/fkAvuzfACzZ3z30m4yOBP7OL9ktoPjY8cNdtEReMeYbz9+mRZa+/inOD XpOlbE6H8Lt2kAaCPSmUdyqjI8qPQ0CCFd3XtWZjDp2mrBKuJ8= Received: by mail.goryachev.org (OpenSMTPD) with ESMTPSA id 3a8c0e72 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Wed, 7 Aug 2024 16:34:18 +0000 (UTC) From: Igor Goryachev To: 72508@debbugs.gnu.org Subject: [PATCH v2 1/5] gnu: erlang-jsx: Fix tests under Erlang 27+. Date: Wed, 7 Aug 2024 19:32:09 +0300 Message-ID: <1234c6aa24e573044ed2075cd712e22431b60897.1723048333.git.igor@goryachev.org> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 72508 Cc: Igor Goryachev , Andrew Tropin 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.0 (-) * gnu/packages/erlang.scm (erlang-jsx): Fix tests under Erlang 27+. Change-Id: Iaade94de64b5e5837a6a54376ba946c20d7107b9 --- gnu/packages/erlang.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/gnu/packages/erlang.scm b/gnu/packages/erlang.scm index b6a31f26e9..60d644ab8d 100644 --- a/gnu/packages/erlang.scm +++ b/gnu/packages/erlang.scm @@ -541,6 +541,16 @@ (define-public erlang-jsx (base32 "1wr7jkxm6nlgvd52xhniav64xr9rml2ngb35rwjwqlqvq7ywhp0c")))) (build-system rebar-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; Fix tests for running under Erlang 27+. + (add-after 'unpack 'fix-tests-for-erlang-27 + (lambda _ + (substitute* "src/jsx_decoder.erl" + (("\\{\"-0\\.0\", \\[\\{float, 0\\.0\\}, end_json\\], <<\"-0\\.0\">>\\},") + "{\"0.0\", [{float, 0.0}, end_json], <<\"0.0\">>}, +{\"-0.0\", [{float, -0.0}, end_json], <<\"-0.0\">>},"))))))) (synopsis "Streaming, evented JSON parsing toolkit") (description "An Erlang application for consuming, producing and manipulating json.") base-commit: 5e567587dd4abf51f9a6fa44f5a852dde1115ce9 -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Wed Aug 07 12:34:50 2024 Received: (at 72508) by debbugs.gnu.org; 7 Aug 2024 16:34:50 +0000 Received: from localhost ([127.0.0.1]:35023 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sbjcf-00045u-RT for submit@debbugs.gnu.org; Wed, 07 Aug 2024 12:34:50 -0400 Received: from mail.goryachev.org ([178.62.244.128]:57114) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sbjce-00045T-2m for 72508@debbugs.gnu.org; Wed, 07 Aug 2024 12:34:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=dkim; bh=V4byajOZ0LFsQcv R0OcSgAaToSi2c1EtYzCXuXOBMuk=; h=references:in-reply-to:date:subject: cc:to:from; d=goryachev.org; b=Wt+RtzPbY1WhSkuubTxpdPmkLsMXv8dx04Ej/Kb bmCjikL9VysD1Z2tdGqO2FE39k5UCvXKF38Htxq5iEBd9dkwN90A77e1T2kIZOQTNm8xhq 5AeeyQDzoRzOXNULmVTHJYdnvZWWQBVaPwCLY1EfrUM1roR+MpQFG97QUlD3Eg= Received: by mail.goryachev.org (OpenSMTPD) with ESMTPSA id e44c59ea (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Wed, 7 Aug 2024 16:34:18 +0000 (UTC) From: Igor Goryachev To: 72508@debbugs.gnu.org Subject: [PATCH v2 2/5] gnu: erlang-yamerl: Update to 0.10.0-0.a24f448. Date: Wed, 7 Aug 2024 19:32:10 +0300 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: <1234c6aa24e573044ed2075cd712e22431b60897.1723048333.git.igor@goryachev.org> References: <1234c6aa24e573044ed2075cd712e22431b60897.1723048333.git.igor@goryachev.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 72508 Cc: Igor Goryachev , Andrew Tropin 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.0 (-) * gnu/packages/erlang.scm (erlang-yamerl): Update to 0.10.0-0.a24f448. Change-Id: Ib279881ff14e6e46ef639c1bcbc53706fa55aef6 --- gnu/packages/erlang.scm | 41 ++++++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/gnu/packages/erlang.scm b/gnu/packages/erlang.scm index 60d644ab8d..80ec673a56 100644 --- a/gnu/packages/erlang.scm +++ b/gnu/packages/erlang.scm @@ -290,26 +290,29 @@ (define-public erlang-cf (license license:expat))) (define-public erlang-yamerl - (package - (name "erlang-yamerl") - (version "0.10.0") - (source - (origin - (method git-fetch) - (uri (git-reference - ;; There are no tests included on Hex. - (url "https://github.com/yakaz/yamerl") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0if8abgmispcfk7zhd0a5dndzwzbsmqrbyrm5shk375r2dbbwak6")))) - (build-system rebar-build-system) - (synopsis "YAML and JSON parser in pure Erlang") - (description - "Erlang application to parse YAML 1.1 and YAML 1.2 documents, as well as + (let ((commit "a24f448c0a8084f70b751dc38621047e56fb53cc") + (revision "0")) + (package + (name "erlang-yamerl") + (version (git-version "0.10.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + ;; There are no tests included on Hex. + (url "https://github.com/yakaz/yamerl") + ;; Fetching commit which includes Erlang 27+ related fixes. + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1csq0z4igyybjgmrynz4d49ysv437iyd2xzkhifb5x47lpdpfpkq")))) + (build-system rebar-build-system) + (synopsis "YAML and JSON parser in pure Erlang") + (description + "Erlang application to parse YAML 1.1 and YAML 1.2 documents, as well as JSON documents.") - (home-page "https://hexdocs.pm/yamerl/") - (license license:bsd-2))) + (home-page "https://hexdocs.pm/yamerl/") + (license license:bsd-2)))) (define-public erlang-covertool (package -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Wed Aug 07 12:34:50 2024 Received: (at 72508) by debbugs.gnu.org; 7 Aug 2024 16:34:50 +0000 Received: from localhost ([127.0.0.1]:35026 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sbjcg-00045y-7P for submit@debbugs.gnu.org; Wed, 07 Aug 2024 12:34:50 -0400 Received: from mail.goryachev.org ([178.62.244.128]:57114) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sbjcf-00045T-0I for 72508@debbugs.gnu.org; Wed, 07 Aug 2024 12:34:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=dkim; bh=MmsUzYeBKBrqHV/ azxyQZV6wh6s7stLFg3eaa3a38Yc=; h=references:in-reply-to:date:subject: cc:to:from; d=goryachev.org; b=oYPtMvcMp71NKLrGzPJDsiMrv86XHze6hMoFTvk mYzTn6y8OMDzMEbZLXwcOtFNlE/OmXt2FPzz3fYzG15Y84burBsO9o05ktImIvhEweXLmg JPyVRUooVv4xVnh8+gdC9saqpeACaoNDko/eWw7kMrgL9X4aNP43hgxOvmG99M= Received: by mail.goryachev.org (OpenSMTPD) with ESMTPSA id fd997407 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Wed, 7 Aug 2024 16:34:19 +0000 (UTC) From: Igor Goryachev To: 72508@debbugs.gnu.org Subject: [PATCH v2 3/5] gnu: erlang-jose: Relax build options. Date: Wed, 7 Aug 2024 19:32:11 +0300 Message-ID: <07e46990b05202875ffa7db4e3b269fea68df2c6.1723048333.git.igor@goryachev.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <1234c6aa24e573044ed2075cd712e22431b60897.1723048333.git.igor@goryachev.org> References: <1234c6aa24e573044ed2075cd712e22431b60897.1723048333.git.igor@goryachev.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 72508 Cc: Igor Goryachev , Andrew Tropin 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.0 (-) * gnu/packages/erlang-xyz.scm (erlang-jose): Relax build options. Change-Id: I0e90cb54558260aea07bc33a11a2ab56261a20bf --- gnu/packages/erlang-xyz.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/gnu/packages/erlang-xyz.scm b/gnu/packages/erlang-xyz.scm index 5661bf52dd..6f1c033aec 100644 --- a/gnu/packages/erlang-xyz.scm +++ b/gnu/packages/erlang-xyz.scm @@ -59,6 +59,18 @@ (define-public erlang-jose (sha256 (base32 "0576jdjygby37qmzrs8cm5l6n622b0mi3z28j6r4s5xsz1px6v0d")))) (build-system rebar-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + ;; Do not treat warnings as errors, for more info see: + ;; https://github.com/potatosalad/erlang-jose/issues/168 + (add-after 'unpack 'relax-build-options + (lambda _ + (substitute* "rebar.config" + (("debug_info,") "debug_info")) + (substitute* "rebar.config" + (("warnings_as_errors") ""))))))) (synopsis "JSON Object Signing and Encryption for Erlang and Elixir") (description -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Wed Aug 07 12:34:55 2024 Received: (at 72508) by debbugs.gnu.org; 7 Aug 2024 16:34:55 +0000 Received: from localhost ([127.0.0.1]:35029 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sbjck-00046T-J7 for submit@debbugs.gnu.org; Wed, 07 Aug 2024 12:34:55 -0400 Received: from mail.goryachev.org ([178.62.244.128]:57114) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sbjcf-00045T-NO for 72508@debbugs.gnu.org; Wed, 07 Aug 2024 12:34:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=dkim; bh=AlVpUFj/wWOz4Zl eXUyTptEZ0nSgaAkQb56v9n1sSsc=; h=references:in-reply-to:date:subject: cc:to:from; d=goryachev.org; b=pNxSC506lvPLOiHCljMb2ycTkVoMmX1BMqVp0+1 wO3q/hzUPSDqqgHrK96vA01Jop6TL5vrf+NutzoFmzS9BEYN2FlvzPCOcHN9mDaLQ4JBuq jEHubcMcUillZ2sKs6/UyuunUltyGqi3WZwN+65O7cxF3gHF4OAz8/hpq6How4= Received: by mail.goryachev.org (OpenSMTPD) with ESMTPSA id 3fe47f9c (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Wed, 7 Aug 2024 16:34:19 +0000 (UTC) From: Igor Goryachev To: 72508@debbugs.gnu.org Subject: [PATCH v2 4/5] gnu: ejabberd: Include jiffy dependence under Erlang 27. Date: Wed, 7 Aug 2024 19:32:12 +0300 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: <1234c6aa24e573044ed2075cd712e22431b60897.1723048333.git.igor@goryachev.org> References: <1234c6aa24e573044ed2075cd712e22431b60897.1723048333.git.igor@goryachev.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 72508 Cc: Igor Goryachev , Andrew Tropin 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.0 (-) * gnu/packages/messaging.scm (ejabberd): Include jiffy dependence under Erlang 27. Change-Id: Id0b0e7acb8100b406a6c686227dd497e0d7434fd --- gnu/packages/messaging.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index fb80866791..da04c34636 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -3706,6 +3706,9 @@ (define-public ejabberd (substitute* "rebar.config" (("\\{copy, \"rel/files/erl\",") "%{copy, \"rel/files/erl\",")) + ;; It seems ejabberd still needs jiffy due to p1_acme. + (substitute* "rebar.config" + (("\\{if_version_below, \"27\",") "{if_version_below, \"30\",")) ;; Unpin pinned dependences. (substitute* "rebar.lock" ((",1\\}") ",0}")) -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Wed Aug 07 12:34:56 2024 Received: (at 72508) by debbugs.gnu.org; 7 Aug 2024 16:34:57 +0000 Received: from localhost ([127.0.0.1]:35031 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sbjcm-00046c-Ch for submit@debbugs.gnu.org; Wed, 07 Aug 2024 12:34:56 -0400 Received: from mail.goryachev.org ([178.62.244.128]:57114) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sbjcg-00045T-Dg for 72508@debbugs.gnu.org; Wed, 07 Aug 2024 12:34:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=dkim; bh=3Nar91LKNKJ4OzV 0j2UY5Ds9eRlNvQaTAKN1lEceIu0=; h=references:in-reply-to:date:subject: cc:to:from; d=goryachev.org; b=OykQweP4GgzWYNS9VzhTCyAzhAbYT1lqax07Pl7 429LchwshGowZ0d7x25kThiiI0O1N5C1st0hOgeI/KYrk6HY4gRRQkA2xkS0mRoP3Kx+Df WmAM1ZH7MzrFTY6qawedp5WyuxUrAIQiBR38aEEDHtGh/yWjXTZH5vJBGt7vtU= Received: by mail.goryachev.org (OpenSMTPD) with ESMTPSA id a26d9a7b (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Wed, 7 Aug 2024 16:34:20 +0000 (UTC) From: Igor Goryachev To: 72508@debbugs.gnu.org Subject: [PATCH v2 5/5] gnu: erlang: Update to 27.0.1. Date: Wed, 7 Aug 2024 19:32:13 +0300 Message-ID: <030c88d6eb7a1bc5e85252dcfc4fe53604d99de5.1723048333.git.igor@goryachev.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <1234c6aa24e573044ed2075cd712e22431b60897.1723048333.git.igor@goryachev.org> References: <1234c6aa24e573044ed2075cd712e22431b60897.1723048333.git.igor@goryachev.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 72508 Cc: Igor Goryachev , Andrew Tropin 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.0 (-) * gnu/packages/erlang.scm (erlang): Update to 27.0.1. Change-Id: Ic603c441cc304ef460e2559c57d765d7e499aad5 --- gnu/packages/erlang.scm | 74 ++++++++++++++++++++++------------------- 1 file changed, 39 insertions(+), 35 deletions(-) diff --git a/gnu/packages/erlang.scm b/gnu/packages/erlang.scm index 80ec673a56..175bbdf8a5 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 "26.2.5") + (version "27.0.1") (source (origin (method git-fetch) ;; The tarball from http://erlang.org/download contains many @@ -61,7 +61,7 @@ (define-public erlang (file-name (git-file-name name version)) (sha256 (base32 - "0hd4flm9x8254rcv8hj0hra5lh5n51vcpharxy2d1ph8059vfsmx")) + "1gzlvbbc1zm87910pnhi94mcpag1zxylhy7m2g4vhlmclyir7gd1")) (patches (search-patches "erlang-man-path.patch")))) (build-system gnu-build-system) (native-inputs @@ -69,13 +69,17 @@ (define-public erlang ;; Erlang's documentation is distributed in a separate tarball. ("erlang-manpages" - ,(origin - (method url-fetch) - (uri (string-append "https://github.com/erlang/otp/releases/download" - "/OTP-" version "/otp_doc_man_" version ".tar.gz")) - (sha256 - (base32 - "08ngil8578asjzmqa657l4zdy0cr0h9spkg88wp9kxl95bfyli8p")))))) + ;; 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"))))))) (inputs (list ncurses openssl wxwidgets)) (propagated-inputs @@ -84,6 +88,7 @@ (define-public erlang `(#:test-target "release_tests" #:configure-flags (list "--disable-saved-compile-time" + "--enable-deterministic-build" "--enable-dynamic-ssl-lib" "--enable-native-libs" "--enable-shared-zlib" @@ -106,34 +111,22 @@ (define-public erlang (time-utc->date (make-time time-utc 0 (string->number (getenv "SOURCE_DATE_EPOCH")))))) - (substitute* "lib/reltool/src/reltool_target.erl" - (("Date = date\\(\\),") - (string-append "Date = " - (date->string source-date-epoch - "'{~Y,~m,~d}',")))) - (substitute* "lib/reltool/src/reltool_target.erl" - (("Time = time\\(\\),") - (string-append "Time = " - (date->string source-date-epoch - "'{~H,~M,~S}',")))) - (substitute* '("lib/reltool/src/reltool_target.erl" - "lib/sasl/src/systools_make.erl") - (("date\\(\\), time\\(\\),") - (date->string source-date-epoch - "{~Y,~m,~d}, {~H,~M,~S},"))) (substitute* "lib/dialyzer/test/small_SUITE_data/src/gs_make.erl" (("tuple_to_list\\(date\\(\\)\\),tuple_to_list\\(time\\(\\)\\)") (date->string source-date-epoch - "tuple_to_list({~Y,~m,~d}), tuple_to_list({~H,~M,~S})"))) - (substitute* "lib/snmp/src/compile/snmpc_mib_to_hrl.erl" - (("\\{Y,Mo,D\\} = date\\(\\),") - (date->string source-date-epoch - "{Y,Mo,D} = {~Y,~m,~d},"))) - (substitute* "lib/snmp/src/compile/snmpc_mib_to_hrl.erl" - (("\\{H,Mi,S\\} = time\\(\\),") - (date->string source-date-epoch - "{H,Mi,S} = {~H,~M,~S},")))))) + "tuple_to_list({~Y,~m,~d}), tuple_to_list({~H,~M,~S})")))))) + ;; When compiling with 'deterministic' option the important meta + ;; information is still needed for some Erlang's dependants, such as + ;; Elixir. We make compiler to preserve it. + ;; For more info see: https://github.com/erlang/otp/issues/8602 + (add-after 'unpack 'preserve-source-meta + (lambda _ + (substitute* "lib/compiler/src/compile.erl" + (("\\[\\{source,Source\\} \\| Info0\\];") + "[{source,Source} | Info0]; + [_|_] = Source when IsDeterministic -> + [{source,Source} | Info0];")))) (add-after 'unpack 'patch-/bin/sh (lambda* (#:key inputs #:allow-other-keys) (let ((sh (search-input-file inputs "/bin/sh"))) @@ -160,10 +153,21 @@ (define-public erlang "lib/reltool/examples/display_args" "lib/reltool/examples/mnesia_core_dump_viewer" "lib/snmp/src/compile/snmpc.src" - "make/verify_runtime_dependencies" - "make/emd2exml.in")))) + "make/verify_runtime_dependencies")))) (substitute* escripts (("/usr/bin/env") (which "env")))))) + ;; Copy modified compiler to bootstrap. It is deterministic, but + ;; preserves 'source' meta information to be used by dependants + ;; of Erlang. + (add-after 'build 'copy-modified-compiler + (lambda _ + (copy-recursively "lib/compiler/ebin/compile.beam" + "bootstrap/lib/compiler/ebin/compile.beam"))) + ;; ... clean everything and rebuild with modified bootstrap. + (add-after 'copy-modified-compiler 'clean-and-make-again + (lambda _ + (invoke "make" "clean") + (invoke "make"))) (add-before 'configure 'set-erl-top (lambda _ (setenv "ERL_TOP" (getcwd)))) -- 2.45.2 From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 08 21:01:58 2024 Received: (at submit) by debbugs.gnu.org; 9 Aug 2024 01:01:58 +0000 Received: from localhost ([127.0.0.1]:37310 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1scE0z-0004nk-L5 for submit@debbugs.gnu.org; Thu, 08 Aug 2024 21:01:57 -0400 Received: from lists.gnu.org ([209.51.188.17]:46694) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1scE0x-0004nb-Fz for submit@debbugs.gnu.org; Thu, 08 Aug 2024 21:01:56 -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 1scE0S-0000Mr-Ew for guix-patches@gnu.org; Thu, 08 Aug 2024 21:01:27 -0400 Received: from out-173.mta0.migadu.com ([91.218.175.173]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1scE0P-0003BZ-7L for guix-patches@gnu.org; Thu, 08 Aug 2024 21:01:23 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=trop.in; s=key1; t=1723165275; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=ff3DL6a3BVfeoMWOE9RmbMKiNUDGhAUgLakQp5GO90o=; b=JYKWSh5+OTGpeN8VRtPqb7RFDutS+Gx39KQlBSN5J1lYC/P6ua//scxmngQp10bioUGfyp Em+tnLGl/JHYWIfNvCuSybm5DwRvtlNdiMdg5tk/MW/G0LOS5e09RYwOFviP9Oeg0qbjhi ijs4z7zvxCg2XFqlhmHGLTCkg8pR3l3ytaUblMdPll7xDk2gaYwiXzhJIfnviESO0D/Rzi TGQYhnowfbHpPaMJ3qpZc7q3KnYYnZXVayVaTUQ9Kap41b2FYtKUNvV/8BdXBvKBSC1Jns Fr//mQNYDIkD0B1imp4Pkj8W4j/wTULgnvdJz6a5ArulE7vXNqmKyA80q41qoQ== From: Andrew Tropin To: Igor Goryachev via Guix-patches via , 72508-done@debbugs.gnu.org Subject: Re: [bug#72508] [PATCH 0/5] Erlang update to 27.0.1. In-Reply-To: References: Date: Fri, 09 Aug 2024 05:01:09 +0400 Message-ID: <87jzgq1pd6.fsf@trop.in> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Migadu-Flow: FLOW_OUT Received-SPF: pass client-ip=91.218.175.173; envelope-from=andrew@trop.in; helo=out-173.mta0.migadu.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit Cc: Igor Goryachev 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.4 (--) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable On 2024-08-07 11:10, Igor Goryachev via Guix-patches via wrote: > Erlang package was cleaned up, updated to version 27.0.1 and several fixe= s/hacks were performed to make it deterministic by modifying its bootstrap. > > Igor Goryachev (5): > gnu: erlang-jsx: Fix tests under Erlang 27+. > gnu: erlang-yamerl: Update to 0.10.0.a24f448. > gnu: erlang-jose: Relax build options. > gnu: ejabberd: Include jiffy dependence under Erlang 27. > gnu: erlang: Update to 27.0.1. > > gnu/packages/erlang-xyz.scm | 12 +++++ > gnu/packages/erlang.scm | 91 +++++++++++++++++++++---------------- > gnu/packages/messaging.scm | 3 ++ > 3 files changed, 68 insertions(+), 38 deletions(-) > > > base-commit: 5e567587dd4abf51f9a6fa44f5a852dde1115ce9 Applied, pushed as https://git.savannah.gnu.org/cgit/guix.git/commit/?id=3D20dbf225f3 Thank you for keeping erlang uptodate! :) =2D-=20 Best regards, Andrew Tropin --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEKEGaxlA4dEDH6S/6IgjSCVjB3rAFAma1alUACgkQIgjSCVjB 3rCm/Q//ewBxCXeVNhE6eH6pgIWyS/tdilyRMDoalEKtN61TinVuE9kmuZkTjtHh mpy4fDBOUn0M40NeLBblq287iGfXx7ocgUuO0CgeE2Mo7/NP8Zf/vhalcWzOa7NO E3FrJjGtinl46O+3SIBuz7eIQwz3WbxSTNVp49KCtQmmxPneGyWakBBboMJV/YV4 uYzmn9RrLlr4dG+svHHD1jyUFtRIhexWcmQlmlVc1Ap/+N4arddlEIkmWNb/k1V2 cJBUqa6ituyokYhioUequ+Sraf8p23865nCFCOBavApQ8HXbc+3lqwPi40T7y9iS 66OHCAZjN1p1j8xCtCVBTiAereOYGNQUpHAk6xQ77jf/1OJd3rdiF1FB1/+v+ksp KRn+z0sQ5qYrC7IXcBBuu3ziaLYl1zO8iuD/jU4+l9rZUsG94NtyGz8aOP4O6FJs DydzCrX4r+/zHgMjo6kInENhWu81aOCXyfPGI8HOQGLBKW+h00PdpgapfKkY1F4i jYxzVId9LN2L0xuiIpKAJhJd/TKhkgU801gzv5bE9yfa1k/gNfOOcqDkTIewkW0c 7IsE1D4uStGHxlWeSVa+wBSoAsrwoGmkDJfjW/4NGLXThwGSX4HCjUJ+uY8VkoMS i6oNOzL1g4A1mhPHoruSmdS4IFAwkSCnqmJeEC5FoI0dvSuhlaY= =9yLJ -----END PGP SIGNATURE----- --=-=-=-- From unknown Mon Jun 23 07:52:15 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sat, 07 Sep 2024 11:24:05 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator