From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.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 6CSQMC/pZmdHXgEAe85BDQ:P1 (envelope-from ) for ; Sat, 21 Dec 2024 16:13:36 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id 6CSQMC/pZmdHXgEAe85BDQ (envelope-from ) for ; Sat, 21 Dec 2024 17:13:35 +0100 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=V4K2YI6i; dkim=fail ("headers rsa verify failed") header.d=goryachev.org header.s=dkim header.b=KkO+UQYR; 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=1734797615; 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:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=e7QBk5Gfv3asFqJGUDa7p05yDWIpCuhY/g5EPg5FV6I=; b=MwPelp4U7u3lCH4A8B/hfskD9CJQN85pnpOqvIFhwchioq/0P+xc+GkOY0Xf5QopA41S7m LVHVBIT14SjxocpP59MoEAXnjFuyPI6mLu2LOKtRH9fBoJmJ4lEKI6lTp3xfliwZAEWZE7 hKI8tMnAZ+D76ZgxeopU8xSWlMsJG4AXMlzkYCvdQyrzVLWmDp2saYQTf9kVAu9RZ0QaVW sJDFuIj6uqUuWFDc+7bXj+8nF0IJw5aAwNArZtqeibwbfEBC01sAGj5CMsvrM7GKHsGUpQ 4gcHloTz82yB4oEsJFnSJjmSbq/5E/9KQfjS+OsUyzzCGxwI5Y/pMiHkn00ImQ== 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=V4K2YI6i; dkim=fail ("headers rsa verify failed") header.d=goryachev.org header.s=dkim header.b=KkO+UQYR; 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=1734797615; a=rsa-sha256; cv=none; b=WLrIXsumxD1qwRWefHaXBYDxDzOnHukIzS7h4C9vdvgaUJmZFJONAVTu/hhF9nkEuCDpk0 jos1aDbCD1MLqmoy4uKbpz73ydHWQMz8tEYB/Pl+kHPSuUhTuj0Maxi6trxyqSyg0FA5k2 wQ/lNA00tjXkoR9iYygqt2ec6s0P0eQ+eKs/U7hLbCEHxieNkAnMJ0Tcu+HjgYxfXBDXIM na8YxihNOAVAQRG/25aPQtywVp1MBsrFyx0rJffmpeXAZVGQIuigaKE7fTp0GqsurWDbDb MHuoIowXGKOwZhYPl6f+kkP0eY9GGk6WnoM5hXY3Czh6u27z1qvD12yrB2noog== 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 45C2F9F3D8 for ; Sat, 21 Dec 2024 17:13:35 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tP26C-0001my-1r; Sat, 21 Dec 2024 11:13:04 -0500 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 1tP26A-0001mC-Pe for guix-patches@gnu.org; Sat, 21 Dec 2024 11:13:02 -0500 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 1tP26A-0002Hu-Gp for guix-patches@gnu.org; Sat, 21 Dec 2024 11:13:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=e7QBk5Gfv3asFqJGUDa7p05yDWIpCuhY/g5EPg5FV6I=; b=V4K2YI6iq2oLMcwAZto0jkgq0zHV3pCHn+8D7zgslIIxeMx7eZnY4ezZhaUDHYzUOzVqAW/t3nkhKvdTSZEKYKpe40EXJEbBUxek9AOW78ci97tA39t3B5WAYuafYdgLCMp5Rt10UYs1mfiki3+ycmfJL8+3+3d4OVwSGDrX5aw9vAr6XlyU6TUU0R16ZRYY4yVo7eYEk54q5xD3go5GfykL6nDomRe/h9EX3HdX7yKxPxwAoRk1yLq/FmNVtJ+/1vyVyf1qKU+L1062brKtlnAE2YgqJJr8bIIWbrTnxMJf1mqVlgWfsPKBxTwa68LGKx2bKR47Pf4VuvULhA2xqQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tP26A-0002te-0W for guix-patches@gnu.org; Sat, 21 Dec 2024 11:13:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75008] [PATCH] gnu: elixir: Update to 1.18.0. Resent-From: Igor Goryachev Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 21 Dec 2024 16:13:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 75008 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75008@debbugs.gnu.org Cc: Igor Goryachev , Zheng Junjie X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.173479757311112 (code B ref -1); Sat, 21 Dec 2024 16:13:01 +0000 Received: (at submit) by debbugs.gnu.org; 21 Dec 2024 16:12:53 +0000 Received: from localhost ([127.0.0.1]:47393 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tP260-0002tA-St for submit@debbugs.gnu.org; Sat, 21 Dec 2024 11:12:53 -0500 Received: from lists.gnu.org ([209.51.188.17]:44868) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tP25z-0002t2-0w for submit@debbugs.gnu.org; Sat, 21 Dec 2024 11:12:51 -0500 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 1tP25x-0001jC-Kg for guix-patches@gnu.org; Sat, 21 Dec 2024 11:12:50 -0500 Received: from mail.goryachev.org ([213.199.41.95]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tP25u-0002Fc-0t for guix-patches@gnu.org; Sat, 21 Dec 2024 11:12:49 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=dkim; bh=eQqw6XbGEDE0V3O ip5gvNPpws5yvhUzuP2yE2lj8+rU=; h=date:subject:cc:to:from; d=goryachev.org; b=KkO+UQYRV/Ub3YYCwninydcjYfa8v1D8Wpxws3VD37HuWPNveR8 TXEUDhKAhoLpLMGxrxN6qhMUI+reKLrVlhaCxnm+mr8nyU0dpb2yi8tvQAuzajw4gxhY8j oVFqLWp9QaeMjsJEF11jkM2zkvpRHHNCFtwRwuPGG4svRPVmdY= Received: by mail.goryachev.org (OpenSMTPD) with ESMTPSA id ee5d241f (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sat, 21 Dec 2024 16:13:15 +0000 (UTC) Date: Sat, 21 Dec 2024 18:12:23 +0200 Message-ID: <4bb69681f5bcbd6b055f89d6f4a9776cdd5b1d8c.1734797543.git.igor@goryachev.org> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=213.199.41.95; 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_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -6.22 X-Spam-Score: -6.22 X-Migadu-Queue-Id: 45C2F9F3D8 X-Migadu-Scanner: mx10.migadu.com X-TUID: cxvXdnr55G9B * gnu/packages/elixir.scm (elixir): Update to 1.18.0. [arguments]: Remove obsolete code, reindent comments, make more deterministic. Change-Id: I6cf8886339cbc4627fb5d89751462b492e7c62f3 --- gnu/packages/elixir.scm | 37 +++++++++++++++++-------------------- 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/gnu/packages/elixir.scm b/gnu/packages/elixir.scm index 459e160830..eb6146cb11 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.3") + (version "1.18.0") (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 "171l6g304044yk6i0827hgl64vp122ygn1wa1xqdjhw08b5kl2pd")) + (base32 "1ki5wfkdidgkvcm3r6b547gkdpchah4r6z0y96frzf5f3prcjgbx")) (patches (search-patches "elixir-path-length.patch")))) (build-system gnu-build-system) (arguments @@ -95,9 +95,9 @@ (define-public elixir (copy-recursively "lib" (string-append (assoc-ref outputs "src") "/source/lib")))) - ;; Temporarily patch the compiler to place correct source - ;; locations into module info instead of build directory. (add-after 'pre-install-source 'patch-elixir-compiler + ;; Temporarily patch the compiler to place correct source + ;; locations into module info instead of build directory. (lambda* (#:key outputs #:allow-other-keys) (copy-recursively compiler-path compiler-path-orig) (let ((source (string-append "/tmp/guix-build-" #$name "-" @@ -107,7 +107,18 @@ (define-public elixir (("source, Source") (string-append "source, string:replace(Source, \"" source "\", \"" destination "\")")))))) - (add-before 'build 'make-current + (add-before 'build 'set-deterministic + (lambda _ + ;; Set deterministic compiler option. + (setenv "ERL_COMPILER_OPTIONS" "deterministic"))) + (add-after 'build 'restore-and-recompile + ;; Unpatch the compiler and recompile it. + (lambda _ + (copy-recursively compiler-path-orig compiler-path) + (delete-file compiler-path-orig) + (invoke "erlc" "-I" "lib/elixir/include" + "-o" "lib/elixir/ebin" compiler-path))) + (add-after 'restore-and-recompile 'make-current ;; The Elixir compiler checks whether or not to compile files ;; by inspecting their timestamps. When the timestamp is ;; equal to the epoch no compilation will be performed. Some @@ -117,24 +128,10 @@ (define-public elixir (let ((recent 1400000000)) (utime file recent recent 0 0))) (find-files "." ".*")))) - ;; Unpatch the compiler and recompile it. - (add-after 'build 'restore-and-recompile - (lambda _ - (copy-recursively compiler-path-orig compiler-path) - (delete-file compiler-path-orig) - (invoke "make"))) (add-before 'check 'set-home - (lambda* (#:key inputs #:allow-other-keys) + (lambda _ ;; 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) base-commit: 11855e1c2863c56d9a3364cdac614a529a1c7cc2 -- 2.46.0