From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id mBgnMkmis2ZqaAEAe85BDQ:P1 (envelope-from ) for ; Wed, 07 Aug 2024 16:35:22 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id mBgnMkmis2ZqaAEAe85BDQ (envelope-from ) for ; Wed, 07 Aug 2024 18:35:21 +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=XU5KCWpw; dkim=fail ("headers rsa verify failed") header.d=goryachev.org header.s=dkim header.b=OykQweP4; dmarc=pass (policy=none) header.from=gnu.org; 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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1723048521; 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=9CXb+/koAfG7UAZjEkZF/w/RVPR1XK+r6c9hF66QePY=; b=Yo6nvR73bYgIKccPonHFGHiLdxWy1gPBW8vftgrFlLMzno+6YebLzPstORHekxk1O9fJZZ J7EaIk92+yNYM0ecuSYl5NmpCmPFVJBveH6Ocy7cGJ5D3Ua5ZEBtJX8rGj4WuzyWH2JVf/ xHmy7v1zAHLIjei4LGCjDRC+gPqYKqYdzbMYntwLnM5tPKTK3OJ+qoOIquaNzxufDyM0wo fMwFRq2F7B/GSzxEWRvm2esWN6MiuaWQzT/xIxqIwdG5GcpHlKt1HpN62UFsMG+4X4/PVI /LLzI6qD+wT168cQl3wLmYLtjNqN3mmAfMMkbJCNBsAu0h2NwuEpYFnUV1ZKIQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1723048521; a=rsa-sha256; cv=none; b=T51pO05qRwD9qwTvHGNs33Q98AFK8Pw6LQVpROAh1HyeO494WryCvnixZqp9xbRr0oEJN+ qPd8HvZu90OpX3EJAt2aR0zc/6NfvFxZtOt7qmXQI0FTvIjItSMBRW6Y9nXq1gM266Xw4Y GwGXUM9/DqQlMRsObpsKv9Rzx878rVAjOBE0PWU0lgSIeONksvDpVZWxDQRFNBCoy6gxNW Kc3o8FzlYA6aV0YkrZZ/9r+uU/Hr2ybW6ZS0QmGCi5aQG4mcgqPU07/3zCGKg65yQI83zO aeiLWp0hwHYI9BqbRq5bdZbNXalNCI6bgQ65p5/YdSrIQrccj/M/4kG4rAZPpQ== 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=XU5KCWpw; dkim=fail ("headers rsa verify failed") header.d=goryachev.org header.s=dkim header.b=OykQweP4; dmarc=pass (policy=none) header.from=gnu.org; 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" 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 824C9697F2 for ; Wed, 7 Aug 2024 18:35:21 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sbjcX-0004c3-Mn; Wed, 07 Aug 2024 12:34:41 -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 1sbjcV-0004bN-Fc for guix-patches@gnu.org; Wed, 07 Aug 2024 12:34:39 -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 1sbjcV-0004zF-4s for guix-patches@gnu.org; Wed, 07 Aug 2024 12:34:39 -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=9CXb+/koAfG7UAZjEkZF/w/RVPR1XK+r6c9hF66QePY=; b=XU5KCWpwjxO2nitn0UDreHzkX/9yAXanZdfasjHYLzZMD2LbwxMcuTMmfPf15OsHTTmxUAmAkeJtp8XjWZbLzGbLib6IA6CjQU4vwWZCsuDWjkkXgWOIX2jmEOc1QJ2QIiyN9C2bhVZ4D0SDz54gbpqY1qRR1DWBWGiqOzzJMQzq1k9LjJPz0M6d6V1UyAYcxeb84I9FJofSvGlXx2qEOv6kdH9K7FqkBpCKvExS2Hq3Dd8aiYisaoAtuhEh9jtbB2OYDYZ5/xZo2WGruHmUQ7aT/aWpczZoLj7DxNl1wooSyOK4EFOTBHVFkubkbPFFbBRjumT/naX/WWEprGq+AA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sbjcu-00047U-DH for guix-patches@gnu.org; Wed, 07 Aug 2024 12:35:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72508] [PATCH v2 5/5] gnu: erlang: Update to 27.0.1. Resent-From: Igor Goryachev Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 07 Aug 2024 16:35:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72508 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72508@debbugs.gnu.org Cc: Igor Goryachev , Andrew Tropin Received: via spool by 72508-submit@debbugs.gnu.org id=B72508.172304849715790 (code B ref 72508); Wed, 07 Aug 2024 16:35:04 +0000 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) 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-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-Queue-Id: 824C9697F2 X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: -4.95 X-Spam-Score: -4.95 X-TUID: m0TSGIoCYJeC * 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