From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms1.migadu.com with LMTPS id MMXsDh4sDGYukAAA62LTzQ:P1 (envelope-from ) for ; Tue, 02 Apr 2024 18:02:38 +0200 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id MMXsDh4sDGYukAAA62LTzQ (envelope-from ) for ; Tue, 02 Apr 2024 18:02:38 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=foundation.xyz header.s=google header.b=fvSBMUHh; dmarc=fail reason="SPF not aligned (relaxed)" header.from=foundation.xyz (policy=none); 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-Seal: i=1; s=key1; d=yhetil.org; t=1712073758; a=rsa-sha256; cv=none; b=LcUoy231CghF/nPGHBgHCO9eyCOUxiSIU/2U77SHXVQYrX/hDuQ2AoxZtl68l2JKtVWsUj OBe75sziYaw+Dohkryz4t5Yc9F/ohmpRUlevHREoE9IFkjL15ptLRZLciZQs2moBUnVgs+ uEIBUxDhZ2pnzyY5ul3QhQ/Z9mU+yr41LBxT7Q7qPqQuTqEC+Vj1/71w1E1R+xZjjFN/sN H7OLTE30sgVacCbynWpr4wj9ZVsKzE361YGlov5M87zMSILZufSK4D4CdYna8zIKOCYzeS WLNclGar9kB0BNvYqhK6wd/6rEOlbd2qjzdPriZliyw+Wo3aNp9kuK5W39RJPg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=foundation.xyz header.s=google header.b=fvSBMUHh; dmarc=fail reason="SPF not aligned (relaxed)" header.from=foundation.xyz (policy=none); 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=1712073758; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: 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=SksR+k1t07Lsev3dk0OrCIVhs/bQTx1blCaecWBRoXo=; b=sT0QexZ1gyKy/omtATWqUWL2JKWYeOmL9MDglwU3bt1mJE/PIxqVq2dZ50suw1Sa+1x/NV c+YzesYaE9PcvciMJQ+6lUc+c8eOF+kPn23NI6dw5ZDqO+k9lqCg8PaJ0z+BR/3zXTWwiV uddU3VemRSM++cEuwJU7nRyJau5TDJY4cFoxN6EDzcU/I4ofkfAMiyalw+8w5mE1Is6C+C XzDv5ijS9wYZgCpN13clBvkdqHFqcQYG5Fiifnj2P7HnS2cN1QxJzv6s9rJBSN6bZ4TyeH Umh3baUJ36YhEibhIKN6yV5UMclK4zyEuM6ky2Nof05q+ptw0QT3E9wvFYIVjA== 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 02B52319E5 for ; Tue, 2 Apr 2024 18:02:38 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rrgaZ-0008HP-Pg; Tue, 02 Apr 2024 12:02:19 -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 1rrgaH-00080C-HK for guix-patches@gnu.org; Tue, 02 Apr 2024 12:02:02 -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 1rrgaH-0004ya-9f for guix-patches@gnu.org; Tue, 02 Apr 2024 12:02:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rrgaI-0005oh-C5; Tue, 02 Apr 2024 12:02:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70146] [PATCH rust-team 000/147] tree-sitter: Update to 0.22.2. Resent-From: Jean-Pierre De Jesus DIAZ Original-Sender: "Debbugs-submit" Resent-CC: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Tue, 02 Apr 2024 16:02:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 70146 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70146@debbugs.gnu.org Cc: Jean-Pierre De Jesus DIAZ , Andrew Tropin , Katherine Cox-Buday , Liliana Marie Prikler X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Andrew Tropin , Katherine Cox-Buday , Liliana Marie Prikler Received: via spool by submit@debbugs.gnu.org id=B.171207371322311 (code B ref -1); Tue, 02 Apr 2024 16:02:02 +0000 Received: (at submit) by debbugs.gnu.org; 2 Apr 2024 16:01:53 +0000 Received: from localhost ([127.0.0.1]:55044 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrga7-0005nk-Ou for submit@debbugs.gnu.org; Tue, 02 Apr 2024 12:01:52 -0400 Received: from lists.gnu.org ([2001:470:142::17]:48564) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrfeF-0003R1-5P for submit@debbugs.gnu.org; Tue, 02 Apr 2024 11:02:03 -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 1rrfdr-0002et-VW for guix-patches@gnu.org; Tue, 02 Apr 2024 11:01:53 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rrfdp-0000Vj-W9 for guix-patches@gnu.org; Tue, 02 Apr 2024 11:01:39 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-41550858cabso24778145e9.2 for ; Tue, 02 Apr 2024 08:01:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foundation.xyz; s=google; t=1712070094; x=1712674894; darn=gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=SksR+k1t07Lsev3dk0OrCIVhs/bQTx1blCaecWBRoXo=; b=fvSBMUHh8eC7NSDuuxDTGNWLU2bbCpvUYeaQGtn1PVCoA17Z/5n0tMJeJtBKZyGixI EkeKD0Jj13/NJu8S/aI/yfhiQohhcKyn50s+YTzT53CSfGCfUmicvxWd9ciHYUOEDtDs XvB0W5Y7kpWxxyQAVdE8ymVMYVxtY5xlpi5niTteAYuznw0zFDnn/K5g9+SgNYQzQ0zQ SfeHwr1BUEoSOMoz1cUXpcV94bZDxJd69g5Z2p5qEUOFhSEw3sNZt3NCtfT3eQFHVjAb n2KFfnFpUdW+u331frk5JhC8IQEe1Z0MV5GRVfW+01DViHIE6+clc2OZCQVIWMZd1Rru 23Jw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712070094; x=1712674894; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=SksR+k1t07Lsev3dk0OrCIVhs/bQTx1blCaecWBRoXo=; b=R9I5yBFqy3Dj/CIDAv1mfnsSSwe6/LFh4VD/RBKmRCArn8cF551mNC1JNwIS58+3qA 2rcSL6uiFS5koZPJKoH+C9dNnpBzjHbTPx0CsFcWWjDqmnrupH2tHTxhCmsh+Xl6q+u5 UcKE4LAECJo6pbA/m16V57xrVc93ebTJZyUDNaHvENNZexyjL5diKdMjj8HXgmqW2DLC iaGQ+y4ZyRoolVm6BnygVeqPFBpdITvwT2/FcR+5LHrvd6zYCA6is9NPsCodikzmXDDU 6y5bALFlvlds0Gw97xQFU78EZ27DSnk3knv+44+6gE3SlYQ4IS3KQjP/Upj90zOssvbm 8bQw== X-Gm-Message-State: AOJu0YyNqpSVQqp3Q70eyk9Fb37nYhN11/maEVlvEN3jrzPdTto/0iq3 3RvW8kNcmfvrHe9gAalKqq0DETIHwml4/wIacz56p4zSo6nZJe1an1NKue24nSOUKWYSi5QfW0O i X-Google-Smtp-Source: AGHT+IFexsWY8YAHbJMDZnUNs5XJcBdhyOVL0/Ap9G1SELpVK+s++zm/OmJ36DT9+uFtl1EvQnQF1g== X-Received: by 2002:a7b:c303:0:b0:414:93df:bef1 with SMTP id k3-20020a7bc303000000b0041493dfbef1mr39226wmj.39.1712070092158; Tue, 02 Apr 2024 08:01:32 -0700 (PDT) Received: from jeandudey.home ([89.131.29.87]) by smtp.gmail.com with ESMTPSA id u12-20020a05600c19cc00b00414659ba8c2sm18236234wmq.37.2024.04.02.08.01.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Apr 2024 08:01:31 -0700 (PDT) From: Jean-Pierre De Jesus DIAZ Date: Tue, 2 Apr 2024 17:01:25 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=jean@foundation.xyz; helo=mail-wm1-x32b.google.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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Tue, 02 Apr 2024 12:01:46 -0400 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: , 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-Spam-Score: 5.15 X-Migadu-Queue-Id: 02B52319E5 X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: 5.15 X-TUID: dQLZH5qE+nam This patch series updates tree-sitter and tree-sitter-cli to the newest packages released, it also updates the grammars if they didn't build with this newer version. I don't think this patch series is fully ready as the tree-sitter ecosystem is still catching up to speed with the new release so not all grammars are updated yet to work. However this patch series provides fixes for most of these grammars and the Rust patches I think could be applied in the meantime. I based this patch series on the `master' branch instead of `rust-team' let me know if it's easier and I can rebase to use that branch instead. I've decided to not package rust-ittapi and rust-ittapi-sys for rust-wasmtime and provided a patch instead to opt-out since these crates are only a facade to a library that needs to be loaded at runtime by Intel® VTune™ which is closed source. Jean-Pierre De Jesus DIAZ (147): gnu: rust-anyhow-1: Update to 1.0.80. gnu: Add rust-clap-lex-0.7. gnu: Add rust-strsim-0.11. gnu: rust-shlex-1: Update to 1.3.0. gnu: Add rust-anstyle-lossy-1. gnu: Add rust-anstyle-svg-0.1. gnu: Add rust-escape8259-0.5. gnu: Add rust-libtest-mimic-0.7. gnu: rust-snapbox-macros-0.3: Update to 0.3.8. gnu: Add rust-snapbox-0.5. gnu: rust-serde-spanned-0.6: Update to 0.6.5. gnu: Add rust-winnow-0.6. gnu: rust-indexmap-2: Update to 2.2.5. gnu: rust-serde-json-1: Update to 1.0.114. gnu: rust-toml-test-data-1: Update to 1.8.0. gnu: Add rust-toml-edit-0.22. gnu: Add rust-trycmd-0.15. gnu: Add rust-heck-0.5. gnu: rust-clap-4: Update to 4.5.3. gnu: rust-libc-0.2: Update to 0.2.153. gnu: Add rust-nix-0.28. gnu: rust-ctrlc-3: Update to 3.4.4. gnu: rust-filetime-0.2: Update to 0.2.23. gnu: rust-value-bag-sval2: Update to 1.8.1. gnu: rust-value-bag-sval2-1: Update to 1.8.1. gnu: rust-value-bag-1: Update to 1.8.1. gnu: rust-log-0.4: Update to 0.4.23. gnu: rust-regex-automata-0.4: Update to 0.4.6. gnu: rust-regex-1: Update to 1.10.3. gnu: rust-semver-1: Update 1.0.22. gnu: rust-serde-derive-1: Update to 1.0.197. gnu: rust-serde-1: Update to 1.0.197. gnu: rust-walkdir-2: Update to 2.5.0. gnu: Add rust-wasmparser-0.201. gnu: Add rust-wasmparser-0.121. gnu: Add rust-wasmparser-0.118. gnu: rust-webbrowser-0.8: Update to 0.8.13. gnu: rust-ctor-0.2: Update to 0.2.7. gnu: rust-rustix-0.38: Update to 0.38.31. gnu: rust-tempfile-3: Update to 3.10.1. gnu: rust-bumpalo-3: Update to 3.15.4. gnu: rust-derive-arbitrary-1: Update to 1.3.2. gnu: rust-arbitrary-1: Update to 1.3.2. gnu: rust-psm-0.1: Update to 0.1.21. gnu: Add rust-afl-0.11. gnu: Add rust-cpp-demangle-0.3. gnu: Add rust-leb128-0.2. gnu: Add rust-wasm-encoder-0.201. gnu: Add rust-wasm-encoder-0.41. gnu: Add rust-wast-201. gnu: Add rust-wast-35. gnu: Add rust-wat-1. gnu: Add rust-id-arena-2. gnu: Add rust-souper-ir-2. gnu: Add rust-fallible-iterator-0.3. gnu: Add rust-slice-group-by-0.3. gnu: Add rust-regalloc2-0.9. gnu: Add rust-capstone-sys-0.13. gnu: Add rust-capstone-0.9. gnu: Add rust-gimli-0.28. gnu: Add rust-cranelift-entity-0.105. gnu: Add rust-cranelift-bforest-0.105. gnu: Add rust-cranelift-codegen-shared-0.105. gnu: Add rust-cranelift-codegen-meta-0.105. gnu: Add rust-cranelift-control-0.105. gnu: Add rust-cranelift-isle-0.105. gnu: Add rust-cranelift-frontend-0.105. gnu: Add rust-cranelift-native-0.105. gnu: Add rust-cranelift-wasm-0.105. gnu: Add rust-cranelift-codegen-0.105. gnu: Add rust-memfd-0.6. gnu: Add rust-ruzstd-0.5. gnu: Add rust-object-0.32. gnu: Add rust-wasmprinter-0.2. gnu: Add rust-wasmtime-component-util-18. gnu: Add rust-wasmtime-types-18. gnu: Add rust-wasmtime-environ-18. gnu: Add rust-winch-codegen-0.16. gnu: Add rust-addr2line-0.21. gnu: Add rust-fxprof-processed-profile-0.6. gnu: Add rust-wasmtime-cache-18. gnu: Add rust-wit-parser-0.13. gnu: Add rust-wasmtime-wit-bindgen-18. gnu: Add rust-wasmtime-component-macro-18. gnu: Add rust-wasmtime-cranelift-shared-18. gnu: Add rust-wasmtime-versioned-export-macros-18. gnu: Add rust-wasmtime-cranelift-18. gnu: Add rust-wasmtime-asm-macros-18. gnu: Add rust-wasmtime-fiber-18. gnu: Add rust-wasmtime-jit-debug-18. gnu: Add rust-wasmtime-jit-icache-coherence-18. gnu: Add rust-wasmtime-wmemcheck-18. gnu: Add rust-wasmtime-winch-18. gnu: Add rust-wasmtime-runtime-18. gnu: Add rust-wasmtime-18. gnu: Add rust-arf-strings-0.7. gnu: Add rust-ambient-authority-0.0.2. gnu: Add rust-fs-set-times-0.20. gnu: Add rust-io-extras-0.18. gnu: Add rust-maybe-owned-0.3. gnu: Add rust-winx-0.36. gnu: Add rust-cap-primitives-2. gnu: Add rust-cap-std-2. gnu: Add rust-cap-fs-ext-2. gnu: Add rust-cap-rand-2. gnu: Add rust-windows-result-0.1. gnu: rust-windows-targets-0.52: Update to 0.52.4. gnu: Add rust-windows-core-0.52. gnu: rust-iana-time-zone-0.1: Update to 0.1.60. gnu: Add rust-cap-time-ext-2. gnu: Add rust-char-device-0.16. gnu: Add rust-fd-lock-4. gnu: Add rust-socketpair-0.19. gnu: Add rust-ssh2-0.9. gnu: Add rust-system-interface-0.26. gnu: Add rust-witx-0.9. gnu: Add rust-wiggle-generate-18. gnu: Add rust-wiggle-macro-18. gnu: Add rust-wiggle-18. gnu: Add rust-wasi-common-18. gnu: Add rust-wasmtime-c-api-macros-18. gnu: Add rust-cap-net-ext-2. gnu: Add rust-wasmtime-wasi-18. gnu: Add rust-wasmtime-c-api-impl-18. gnu: rust-cc-1: Update to 1.0.90. gnu: rust-thiserror-1: Update to 1.0.58. gnu: Add rust-smol-potat-macro-0.6. gnu: Add rust-smol-potat-1. gnu: Add rust-event-listener-5. gnu: Add rust-async-process-2. gnu: Add rust-async-fs-2. gnu: Add rust-smol-2. gnu: Add rust-fs4-0.8. gnu: libloading-0.8: Update to 0.8.3. gnu: rust-proc-macro2-1: Update to 1.0.79. gnu: rust-toml-0.8: Update to 0.8.12. gnu: tree-sitter: Update to 0.22.2. gnu: tree-sitter-html: Update to 0.20.2. gnu: tree-sitter-css: Update to 0.20.0-1.02b4ee7. gnu: tree-sitter-bash: Update to 0.21.0. gnu: tree-sitter-elm: Update to 5.7.0. gnu: tree-sitter-haskell: Update to 0.15.0. gnu: tree-sitter-json: Update to 0.20.2. gnu: tree-sitter-julia: Update to 0.20.0. gnu: tree-sitter-scheme: Update to 0.6.0-9.184e759. gnu: tree-sitter-racket: Update to 0.3.0-10.d9858a0. gnu: tree-sitter-lua: Update to 0.1.0. gnu/local.mk | 3 + gnu/packages/crates-io.scm | 2920 +++++++++++++++-- gnu/packages/crates-windows.scm | 74 +- .../rust-wasmtime-18-remove-ittapi.patch | 46 + .../tree-sitter-org-package-json.patch | 35 + .../tree-sitter-plantuml-package-json.patch | 38 + gnu/packages/tree-sitter.scm | 586 ++-- guix/build/tree-sitter-build-system.scm | 4 + 8 files changed, 3261 insertions(+), 445 deletions(-) create mode 100644 gnu/packages/patches/rust-wasmtime-18-remove-ittapi.patch create mode 100644 gnu/packages/patches/tree-sitter-org-package-json.patch create mode 100644 gnu/packages/patches/tree-sitter-plantuml-package-json.patch base-commit: 7af70efd7633b0d70091762cf43ce01a86176e8e -- 2.41.0