From patchwork Mon Aug 19 15:02:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Waldemar Brodkorb X-Patchwork-Id: 1973868 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::133; helo=smtp2.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WnbRp2vRhz1yg2 for ; Tue, 20 Aug 2024 01:02:30 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 0979A405FB; Mon, 19 Aug 2024 15:02:27 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id hyPCoewP5JNw; Mon, 19 Aug 2024 15:02:24 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 2A69E4036F Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id 2A69E4036F; Mon, 19 Aug 2024 15:02:24 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 963AA1BF307 for ; Mon, 19 Aug 2024 15:02:22 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 833F681066 for ; Mon, 19 Aug 2024 15:02:22 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id bRQUGvzbRTsb for ; Mon, 19 Aug 2024 15:02:21 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=89.238.66.15; helo=helium.openadk.org; envelope-from=wbx@openadk.org; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp1.osuosl.org 7AEC68105C DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 7AEC68105C Received: from helium.openadk.org (helium.openadk.org [89.238.66.15]) by smtp1.osuosl.org (Postfix) with ESMTPS id 7AEC68105C for ; Mon, 19 Aug 2024 15:02:19 +0000 (UTC) Received: by helium.openadk.org (Postfix, from userid 1000) id 01323353644A; Mon, 19 Aug 2024 17:02:15 +0200 (CEST) Date: Mon, 19 Aug 2024 17:02:15 +0200 From: Waldemar Brodkorb To: buildroot@buildroot.org Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-Operating-System: Linux 5.10.0-31-amd64 x86_64 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=openadk.org; s=2022; t=1724079736; bh=b4iIiiWC3mY/5SqSaZwSGC5ogxP7dTTdTxU2dT8d/7A=; h=Date:From:To:Subject:From; b=glftfwVL+vUoHWcT/XlrlloysnSTUB9kJ3RU3tFQO0DU/b7wEhaAyg9WLHFGHoN45 BQ4Fc7788g24vjOabIzlxiTFPJeXO4ApHhABfcb77nyFTkI9a3ifKsJ0NXg0zF0kbF m2EGnnfm9oNW2iI0sAW1cI50/TVE1HEAPbMRs4VBsiIaMF6AiNimuM9CavmvqjsSMx hDLULtKHM8Fjt0YarXBYYgiNIlerOXBI/TTSvY9n2j2rvwF22hgMz/s5x+UefnEr8q mL/XKO/r+0x4En4JtH5RFdNKGkzdYuy6ZXBmHgjAJ4xwM/CfWFPqhVctxeQeVApNwI 3Y3sFuomKgkVg== X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dmarc=none (p=none dis=none) header.from=openadk.org X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dkim=pass (2048-bit key, unprotected) header.d=openadk.org header.i=@openadk.org header.a=rsa-sha256 header.s=2022 header.b=glftfwVL Subject: [Buildroot] [PATCH next] package/nushell: update to 0.96.1 X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" For changes see the nushell blog: https://www.nushell.sh/blog/ Broken since the update of rust in -next. Patch for sparc64 no longer required. Fixes: - http://autobuild.buildroot.org/results/f11/f11c62f504e9ce68ed9e3fb3533d53942cb87092 Signed-off-by: Waldemar Brodkorb --- .../0001-uucore-add-support-for-sparc64.patch | 59 ------------------- package/nushell/nushell.hash | 2 +- package/nushell/nushell.mk | 9 +-- 3 files changed, 2 insertions(+), 68 deletions(-) delete mode 100644 package/nushell/0001-uucore-add-support-for-sparc64.patch diff --git a/package/nushell/0001-uucore-add-support-for-sparc64.patch b/package/nushell/0001-uucore-add-support-for-sparc64.patch deleted file mode 100644 index ad7e70a56d..0000000000 --- a/package/nushell/0001-uucore-add-support-for-sparc64.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 9f4330f94cc471d880df7d9089ee1105b27fd321 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 6 Jan 2024 10:26:54 +0100 -Subject: [PATCH] uucore: add support for sparc64 - -Add support for sparc64 in uucore to avoid the following build failure -with nushell: - -error[E0308]: mismatched types - --> /home/autobuild/autobuild/instance-7/output-1/build/nushell-0.85.0/VENDOR/uucore/src/lib/features/fs.rs:121:16 - | -111 | pub fn number_of_links(&self) -> u64 { - | --- expected `u64` because of return type -... -121 | return self.0.st_nlink; - | ^^^^^^^^^^^^^^^ expected `u64`, found `u32` - | -help: you can convert a `u32` to a `u64` - | -121 | return self.0.st_nlink.into(); - | +++++++ - -For more information about this error, try `rustc --explain E0308`. -error: could not compile `uucore` (lib) due to previous error - -Fixes: - - http://autobuild.buildroot.org/results/f9f0287a8e39c65895014ca513ed25071f020add - -Signed-off-by: Fabrice Fontaine -Upstream: https://github.com/uutils/coreutils/commit/d158f1a396d19cc2aed68131b80ec3b7325d108e -[Dario: make the patch to be applied with fuzz factor 0] -Signed-off-by: Dario Binacchi ---- - src/uucore/src/lib/features/fs.rs | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/VENDOR/uucore/src/lib/features/fs.rs b/VENDOR/uucore/src/lib/features/fs.rs -index 20cc9e13d..3b9170bc3 100644 ---- a/VENDOR/uucore/src/lib/features/fs.rs -+++ b/VENDOR/uucore/src/lib/features/fs.rs -@@ -116,6 +116,7 @@ - not(target_os = "freebsd"), - not(target_arch = "aarch64"), - not(target_arch = "riscv64"), -+ not(target_arch = "sparc64"), - target_pointer_width = "64" - ))] - return self.0.st_nlink; -@@ -127,6 +128,7 @@ - target_os = "freebsd", - target_arch = "aarch64", - target_arch = "riscv64", -+ target_arch = "sparc64", - not(target_pointer_width = "64") - ) - ))] --- -2.43.0 - diff --git a/package/nushell/nushell.hash b/package/nushell/nushell.hash index c125a6c652..8336054455 100644 --- a/package/nushell/nushell.hash +++ b/package/nushell/nushell.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 9175b7e25a93a35c4f2690a63e7c36ac2dc31a9d762f59de01aac8ac1075b02f nushell-0.85.0-cargo2.tar.gz +sha256 592f3b74156be0e65f8ef01fbc2e947480b91407190f93761d7c9531f381bfac nushell-0.96.1-cargo2.tar.gz sha256 2dc1f03f729c21902d869b4d8f8dc528fc730f4c6ad83fc128672bda0ad69196 LICENSE diff --git a/package/nushell/nushell.mk b/package/nushell/nushell.mk index 7b538da4e2..a05eaa9829 100644 --- a/package/nushell/nushell.mk +++ b/package/nushell/nushell.mk @@ -4,19 +4,12 @@ # ################################################################################ -NUSHELL_VERSION = 0.85.0 +NUSHELL_VERSION = 0.96.1 NUSHELL_SITE = $(call github,nushell,nushell,$(NUSHELL_VERSION)) NUSHELL_LICENSE = MIT NUSHELL_LICENSE_FILES = LICENSE NUSHELL_DEPENDENCIES = host-pkgconf openssl ncurses -# 0001-uucore-add-support-for-sparc64.patch -define NUSHELL_PATCH_CHECKSUM_FILE - $(SED) 's/b0390ae7bca8b31f0db289a5d064bba36d45e4d137674e9df2c6ab6256f926f4/f8ce2ad571e1482f6833cb147eafeb724776e7887ebabf339a5f3e79860583cb/' \ - $(@D)/VENDOR/uucore/.cargo-checksum.json -endef -NUSHELL_POST_PATCH_HOOKS += NUSHELL_PATCH_CHECKSUM_FILE - # Add /usr/bin/nu to /etc/shells as in package/bash/bash.mk define NUSHELL_ADD_NU_TO_SHELLS grep -qsE '^/usr/bin/nu$$' $(TARGET_DIR)/etc/shells \