From patchwork Mon Mar 25 17:05:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Leo_Nikkil=C3=A4?= X-Patchwork-Id: 62249 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 87CCA27BBE9; Mon, 25 Mar 2024 17:08:12 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 62E9F27BBE2 for ; Mon, 25 Mar 2024 17:08:10 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ronno-0006JM-W4; Mon, 25 Mar 2024 13:08:05 -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 1ronnn-0006J8-Oj for guix-patches@gnu.org; Mon, 25 Mar 2024 13:08:03 -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 1ronnn-0000fZ-G5 for guix-patches@gnu.org; Mon, 25 Mar 2024 13:08:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ronnm-0005rX-K2 for guix-patches@gnu.org; Mon, 25 Mar 2024 13:08:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69999] [PATCH] gnu: elixir: Update to 1.16.2. Resent-From: Leo =?utf-8?q?Nikkil=C3=A4?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 25 Mar 2024 17:08:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 69999 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69999@debbugs.gnu.org Cc: Leo =?utf-8?q?Nikkil=C3=A4?= X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.171138642422452 (code B ref -1); Mon, 25 Mar 2024 17:08:02 +0000 Received: (at submit) by debbugs.gnu.org; 25 Mar 2024 17:07:04 +0000 Received: from localhost ([127.0.0.1]:36086 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ronmn-0005pg-Cq for submit@debbugs.gnu.org; Mon, 25 Mar 2024 13:07:04 -0400 Received: from lists.gnu.org ([2001:470:142::17]:50554) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ronmi-0005pJ-9r for submit@debbugs.gnu.org; Mon, 25 Mar 2024 13:06:59 -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 1ronmd-0005YL-OF for guix-patches@gnu.org; Mon, 25 Mar 2024 13:06:51 -0400 Received: from fout6-smtp.messagingengine.com ([103.168.172.149]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ronmb-0000R8-4D for guix-patches@gnu.org; Mon, 25 Mar 2024 13:06:51 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailfout.nyi.internal (Postfix) with ESMTP id F0FE6138011A; Mon, 25 Mar 2024 13:06:45 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Mon, 25 Mar 2024 13:06:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lnikki.la; h=cc :cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:message-id:mime-version:reply-to :subject:subject:to:to; s=fm3; t=1711386405; x=1711472805; bh=iY 2wZGZf77UvvwqOcbUnIQN3lYbsr0cs+BPFSvdEY/g=; b=Mdc8t9e8zXITjmw+++ 64VxpZgVtRRZhV4sBd//5bzmVpYKy8bG2PLNca0JjL96dJvcnZLOJt62YvPMaC3f 19kHKypOzkp1uCmCn9SwRhaZlJNk5lKwfQJ5l5tTTA6W3uKk/MjzmE0UF0IJSWng 3eCFijtMfS2PPIkn12bCDI2m3sksGOHeKBETZr1CDlLGusEA0Vd53KdLvOZRIia1 eXRdZTi3GOmqua+dP/StV8z3SLb/fZvkMFtYjbiKCw6L5h4YO2BnsY5Vlk1iHYt3 7Kx019INUbALXLYzD1JdeN24WFoUdInTK78IL6bFV/3A2fAU9RNF7QZFlnh9si0c hUvA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:message-id:mime-version:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; t=1711386405; x=1711472805; bh=iY2wZGZf77Uvv wqOcbUnIQN3lYbsr0cs+BPFSvdEY/g=; b=maCb04RyKRQzwC2GfvMvgQ1fQVN/B MeR0IMwHQBjzyHYDMTd9VrYgJmMwHU3VYBogcm+/5kQ4tikm7GMJ2A3oBPRasizW rUUbF57y9szC5THUDTsErq9ugVHqIl80Mhe30XVOvXvEJFYv0HOQMH5S+5UMGtHy c9ZPTOqOi9z8qNKqpveR0bwxtG9SisRMV/fS1fWL+q1ATU8F+uK2BoYrmUPihPAM k79/S9hr0eBaBKkpHQBfVqqfUaI8GzlH6Bbfw9SiiSA29Ax7vcO4hEwk7OeQG8ZL Gl8E6k/BDvgWIiJ5uGSrhnkiY2uGsVyG8MivE65eXwxgs0XczRgAen9hA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrudduuddgfeeiucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffogggtgfesthekre dtredtjeenucfhrhhomhepnfgvohcupfhikhhkihhlmocuoehhvghllhhosehlnhhikhhk ihdrlhgrqeenucggtffrrghtthgvrhhnpedtffduheelveejtdevgffhieehhfeuudegie ehjeeghefgvdffgeejfedvtedvgeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgr mhepmhgrihhlfhhrohhmpehhvghllhhosehlnhhikhhkihdrlhgr X-ME-Proxy: Feedback-ID: i41f146a7:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 25 Mar 2024 13:06:45 -0400 (EDT) Date: Mon, 25 Mar 2024 19:05:51 +0200 Message-ID: <20240325170615.11487-1-hello@lnikki.la> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Received-SPF: pass client-ip=103.168.172.149; envelope-from=hello@lnikki.la; helo=fout6-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_DNSWL_LOW=-0.7, 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: Leo =?utf-8?q?Nikkil=C3=A4?= X-ACL-Warn: , =?utf-8?q?Leo_Nikkil=C3=A4_via_Guix-patches?= X-Patchwork-Original-From: =?utf-8?q?Leo_Nikkil=C3=A4_via_Guix-patches?= via From: =?utf-8?q?Leo_Nikkil=C3=A4?= Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/patches/elixir-1.16-iex-tests.patch: New file. * gnu/packages/elixir.scm (elixir): Update to 1.16.2. Add patch. * gnu/local.mk (dist_patch_DATA): Register patch. --- gnu/local.mk | 1 + gnu/packages/elixir.scm | 10 ++- .../patches/elixir-1.16-iex-tests.patch | 88 +++++++++++++++++++ 3 files changed, 96 insertions(+), 3 deletions(-) create mode 100644 gnu/packages/patches/elixir-1.16-iex-tests.patch diff --git a/gnu/local.mk b/gnu/local.mk index 7f1006010b..e7a8298764 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1119,6 +1119,7 @@ dist_patch_DATA = \ %D%/packages/patches/eigen-fix-strict-aliasing-bug.patch \ %D%/packages/patches/einstein-build.patch \ %D%/packages/patches/elfutils-tests-ptrace.patch \ + %D%/packages/patches/elixir-1.16-iex-tests.patch \ %D%/packages/patches/elixir-path-length.patch \ %D%/packages/patches/elm-ghc9.2.patch \ %D%/packages/patches/elm-offline-package-registry.patch \ diff --git a/gnu/packages/elixir.scm b/gnu/packages/elixir.scm index 2885ddbd61..6aace1c01e 100644 --- a/gnu/packages/elixir.scm +++ b/gnu/packages/elixir.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2021 Cees de Groot ;;; Copyright © 2024 Andrew Tropin ;;; Copyright © 2024 Ivan Sokolov +;;; Copyright © 2024 Leo Nikkilä ;;; ;;; This file is part of GNU Guix. ;;; @@ -39,7 +40,7 @@ (define-module (gnu packages elixir) (define-public elixir (package (name "elixir") - (version "1.14.0") + (version "1.16.2") (source (origin (method git-fetch) @@ -48,8 +49,11 @@ (define-public elixir (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "16rc4qaykddda6ax5f8zw70yhapgwraqbgx5gp3f40dvfax3d51l")) - (patches (search-patches "elixir-path-length.patch")))) + (base32 "145lwbwpyj686rq3xkzg4i07v0z8x2j185aa2lvyj5ppzv2ihiim")) + (patches (search-patches "elixir-path-length.patch" + ;; This patch has been merged and should + ;; be included in the next version. + "elixir-1.16-iex-tests.patch")))) (build-system gnu-build-system) (arguments (list diff --git a/gnu/packages/patches/elixir-1.16-iex-tests.patch b/gnu/packages/patches/elixir-1.16-iex-tests.patch new file mode 100644 index 0000000000..d190036764 --- /dev/null +++ b/gnu/packages/patches/elixir-1.16-iex-tests.patch @@ -0,0 +1,88 @@ +From d17df054e21795637d5d265e3e37c4791404e6b2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jos=C3=A9=20Valim?= +Date: Thu, 8 Feb 2024 08:08:03 +0100 +Subject: [PATCH] Skip tests if Erlang was compiled without docs, closes #13322 + +--- + lib/iex/test/iex/helpers_test.exs | 12 +++++++++--- + lib/iex/test/test_helper.exs | 10 +++++++++- + 2 files changed, 18 insertions(+), 4 deletions(-) + +diff --git a/lib/iex/test/iex/helpers_test.exs b/lib/iex/test/iex/helpers_test.exs +index 18b19ddce56..56e8c014450 100644 +--- a/lib/iex/test/iex/helpers_test.exs ++++ b/lib/iex/test/iex/helpers_test.exs +@@ -332,17 +332,20 @@ defmodule IEx.HelpersTest do + assert help =~ "Welcome to Interactive Elixir" + end + ++ @tag :erlang_doc + test "prints Erlang module documentation" do + captured = capture_io(fn -> h(:timer) end) + assert captured =~ "This module provides useful functions related to time." + end + ++ @tag :erlang_doc + test "prints Erlang module function specs" do + captured = capture_io(fn -> h(:timer.sleep() / 1) end) + assert captured =~ ":timer.sleep/1" + assert captured =~ "-spec sleep(Time) -> ok when Time :: timeout()." + end + ++ @tag :erlang_doc + test "handles non-existing Erlang module function" do + captured = capture_io(fn -> h(:timer.baz() / 1) end) + assert captured =~ "No documentation for :timer.baz was found" +@@ -1008,13 +1011,15 @@ defmodule IEx.HelpersTest do + cleanup_modules([TypeSample]) + end + +- test "prints all types in erlang module" do ++ @tag :erlang_doc ++ test "prints all types in Erlang module" do + captured = capture_io(fn -> t(:queue) end) + assert captured =~ "-type queue() :: queue(_)" + assert captured =~ "-opaque queue(Item)" + end + +- test "prints single type from erlang module" do ++ @tag :erlang_doc ++ test "prints single type from Erlang module" do + captured = capture_io(fn -> t(:erlang.iovec()) end) + assert captured =~ "-type iovec() :: [binary()]" + assert captured =~ "A list of binaries." +@@ -1024,7 +1029,8 @@ defmodule IEx.HelpersTest do + assert captured =~ "A list of binaries." + end + +- test "handles non-existing types from erlang module" do ++ @tag :erlang_doc ++ test "handles non-existing types from Erlang module" do + captured = capture_io(fn -> t(:erlang.foo()) end) + assert captured =~ "No type information for :erlang.foo was found or :erlang.foo is private" + +diff --git a/lib/iex/test/test_helper.exs b/lib/iex/test/test_helper.exs +index f5a55f0aa80..b32c8be4e91 100644 +--- a/lib/iex/test/test_helper.exs ++++ b/lib/iex/test/test_helper.exs +@@ -7,11 +7,19 @@ IEx.configure(colors: [enabled: false]) + {line_exclude, line_include} = + if line = System.get_env("LINE"), do: {[:test], [line: line]}, else: {[], []} + ++erlang_doc_exclude = ++ if match?({:docs_v1, _, _, _, _, _, _}, Code.fetch_docs(:array)) do ++ [] ++ else ++ IO.puts("Erlang/OTP compiled without docs, some tests are excluded...") ++ [:erlang_doc] ++ end ++ + ExUnit.start( + assert_receive_timeout: assert_timeout, + trace: !!System.get_env("TRACE"), + include: line_include, +- exclude: line_exclude ++ exclude: line_exclude ++ erlang_doc_exclude + ) + + defmodule IEx.Case do