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 ms1.migadu.com with LMTPS id mImtHNkyDGat4AAAe85BDQ:P1 (envelope-from ) for ; Tue, 02 Apr 2024 18:31:21 +0200 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 mImtHNkyDGat4AAAe85BDQ (envelope-from ) for ; Tue, 02 Apr 2024 18:31:21 +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=RbuUL0gF; 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=fail reason="SPF not aligned (relaxed)" header.from=foundation.xyz (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1712075481; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: 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=jBq19u71qB2NqQUcB0S2etn/2rUnVH5CFQ8b+sGUEhw=; b=fwdZ74yHx0zGQDypH6swrsW3vhXoilKfY9uvY6FnRMd3O0lxg1QqAU0LjhOIuhLEEO+Fxg NPCDyM/pQqkQ8PlPDOAyT1AICPDFOcTm4U/Q1KGrSWRqQeJGrmjfCtW+bxl1OZfo1SOsZ6 Wj4ObfkxyX97hSNQIAzezWNAoCr6Zrr/cNPtzEnH6mREAWQ5mwF1coRJT8x9+R0/nddZNl YZjL8wOWjPsgizH1LFKgCle89cJyDnZR/Ks3DdzO01MWdnO6G0b5cph5maSCpBHc7FCpYv 3EM4mxDXQQ7+lsUa41M5H99h5OGPb5clC5nfRv+VfCu962wG/02LhPwR1Ly8RQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=foundation.xyz header.s=google header.b=RbuUL0gF; 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=fail reason="SPF not aligned (relaxed)" header.from=foundation.xyz (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1712075481; a=rsa-sha256; cv=none; b=aaZtuNUKXHLBLso4TElJyGF0f/z8oPxJKVLSFwPu2eQM47mqqrmtqHmHEXgNd3PFB0pH1/ YJz7Ox/mWc2x/TIRjzjB6HZgirKp+VNYT1Z+Mvqg7pOnnorkSRCut6dg1kTnmJ5PP834SA ltvYt/21h8p5YoM6L/I03OLsp8iQaeKFMgHEiAX4yodvHZoesAazlYWOY9vmWXT14SceT2 TTrC5ldeyaw+9vDDxsWY2GK0BC093H3xxoLcTpbQTLS3SOPKirxvxIiG4nOGpoDyKC4DJO 7SywjgjfOxXHqG6WteTgDZmJfQaYWO17FHXIQ/wK8h5bzr3J/llBTmCH3GTS7Q== 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 2E551D4CE for ; Tue, 2 Apr 2024 18:31:21 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rrh2Q-000713-HV; Tue, 02 Apr 2024 12:31:06 -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 1rrh2K-00070h-6a for guix-patches@gnu.org; Tue, 02 Apr 2024 12:31:00 -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 1rrh2J-000430-Ux for guix-patches@gnu.org; Tue, 02 Apr 2024 12:30:59 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rrh2N-0000up-Bx for guix-patches@gnu.org; Tue, 02 Apr 2024 12:31:03 -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: guix-patches@gnu.org Resent-Date: Tue, 02 Apr 2024 16:31:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70146 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Efraim Flashner , Jean-Pierre De Jesus DIAZ , 70146@debbugs.gnu.org, Andrew Tropin , Katherine Cox-Buday , Liliana Marie Prikler Received: via spool by 70146-submit@debbugs.gnu.org id=B70146.17120754223416 (code B ref 70146); Tue, 02 Apr 2024 16:31:03 +0000 Received: (at 70146) by debbugs.gnu.org; 2 Apr 2024 16:30:22 +0000 Received: from localhost ([127.0.0.1]:56059 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrh1g-0000sj-6M for submit@debbugs.gnu.org; Tue, 02 Apr 2024 12:30:22 -0400 Received: from mail-ua1-x92d.google.com ([2607:f8b0:4864:20::92d]:56552) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrh1c-0000qn-Mm for 70146@debbugs.gnu.org; Tue, 02 Apr 2024 12:30:19 -0400 Received: by mail-ua1-x92d.google.com with SMTP id a1e0cc1a2514c-7e04e70c372so1642075241.0 for <70146@debbugs.gnu.org>; Tue, 02 Apr 2024 09:30:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foundation.xyz; s=google; t=1712075406; x=1712680206; darn=debbugs.gnu.org; h=content-transfer-encoding:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=jBq19u71qB2NqQUcB0S2etn/2rUnVH5CFQ8b+sGUEhw=; b=RbuUL0gFDPTuPtTp1pBjpD5hoAhuJpZln3N6PXyYeWqqzxBcryq74gNRWiOGp4aUTl p1IoLbPJ45Va7LLqG17888SptLTc4yhY16SiYpKDciXvKPNmScRisv7b5ts4sEY+erOx IhmTieSc87a4x/erjL8YErV1ykDjDOPx3+3PPPnKVHrpSDmhp5MkDK9CdO64IULams8E rBw+LW0JvKa50N850zlGa/XZYF4j5nEQETpxqvqdW6PkmJSK+Q9diW8PSO5P5dPCwjPk JVxBxzMCDDfGCKXyjoYEeuRwbfRn7M5I8rqYvnbAWr8+cYWJhSBIY52xGQMY9K8hiIXr R7hA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712075406; x=1712680206; h=content-transfer-encoding:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jBq19u71qB2NqQUcB0S2etn/2rUnVH5CFQ8b+sGUEhw=; b=Ax3Om6TwBJBlVrSFUfbUcCiZcCVu5ZhWekHBTjvT1X40ArT2rmHBDRvaAHSOfjcFXH 4+sVVq6fS1h7NG97qr/9bnIMqAoe0jX2o74cIUVozmvCN30JfCExZcy4kjkPPHzPA0fT Jqw9lDyKA2W3g8oGlQmx5IP1FzL/3SsndTbBNmqVPzPfcjtkRcc6mTHmVowzoGfZpcbv xJMNvtiCTrPq4OrkpZTBJsZYX8O6b6nYRpH5ugFQ1cecU8DC9JQQvgB0Yc12hgob4gAp 9noiTsu5IoQfhsI38wuUcgQi295LKzevBTfn/T9hhixSRCjRYgZTqjlf8B1uIil2xCMj /rtw== X-Forwarded-Encrypted: i=1; AJvYcCXeV+53YcfjsyRczqXa2fv1tRzEBj7quWHqP4f87CJauXACVKRVEEUVEF3F8w9ObVPt9JvP3uGmQDealb24puPULWBSrl8= X-Gm-Message-State: AOJu0YzLX6s5enKe5gud3yrveWiVNnQyFJOnIS3RkztSxhBl6h1emhnY e8YCQWQsS6d5dW8E9FndCPSp8OXyoCgvPZDOlh4rPbj1+FDMpSATzs6rEdNOfV+AglO3+MXJYy2 7a7z8s9aYxpJODnFVwanssg3Wtjy8YrPLY46cdg== X-Google-Smtp-Source: AGHT+IHZ/XIiBGozvZoVbUU7UBmagDV9zJ5WUDlJK0ObigLUobop+PXj2ZVXG4G3FNc6skj9h5lcUM2ERDHXpEZsLj4= X-Received: by 2002:a05:6102:114c:b0:478:411b:af4f with SMTP id j12-20020a056102114c00b00478411baf4fmr9954404vsg.6.1712075406106; Tue, 02 Apr 2024 09:30:06 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Jean-Pierre De Jesus Diaz Date: Tue, 2 Apr 2024 16:29:55 +0000 Message-ID: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable 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-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Queue-Id: 2E551D4CE X-Spam-Score: -3.75 X-Migadu-Spam-Score: -3.75 X-Migadu-Scanner: mx10.migadu.com X-TUID: LaxBo/Ms/NUb >I have to admit I was looking at tree-sitter recently and wondering if >it should be upgraded, and if all the grammars needed to be upgraded >too at the same time. I've updated the grammars that didn't build with the newer versions on the same commit of tree-sitter update. Some required patches here and there and they should be working fine. Haven't tested all of the parsers yet in an editor. Most of the errors were in the tests because this new version changed how the highlight rules are prioritized so they need to be reordered in the file. Others because regex brace escaping changed. >Another option if they're not all ready at the same time, can different >grammars use different versions? Or in that case would it make more >sense to prepare all the dependencies for the next tree-sitter version >and then just not actually upgrade it until everything is ready? I thought the same too, but I didn't know if it was suitable for Guix to do that so that's why I opted into patching the grammars. However looking at some of the grammars it seems that they don't have much maintenance so looking at the future these grammars will be even harder to compile in future versions so it'd make sense to have different versions= of `tree-sitter-cli' to accomodate for this. (some grammars haven't seen a commit in 2 years for example). I think delaying until everything is working will be hard because of that. I think I can update the patch series to have two tree-sitter-cli versions. On Tue, Apr 2, 2024 at 4:16=E2=80=AFPM Efraim Flashner wrote: > > On Tue, Apr 02, 2024 at 05:01:25PM +0200, Jean-Pierre De Jesus DIAZ wrote= : > > 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 have to admit I was looking at tree-sitter recently and wondering if > it should be upgraded, and if all the grammars needed to be upgraded > too at the same time. > > Another option if they're not all ready at the same time, can different > grammars use different versions? Or in that case would it make more > sense to prepare all the dependencies for the next tree-sitter version > and then just not actually upgrade it until everything is ready? > > > 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'll see how well the patches apply. I see a couple that are already on > the rust-team branch. > > > 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=C2=AE VTune=E2=84=A2 which is closed source. > > Makes sense. > > > 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.p= atch > > create mode 100644 gnu/packages/patches/tree-sitter-plantuml-package-j= son.patch > > > > > > base-commit: 7af70efd7633b0d70091762cf43ce01a86176e8e > > -- > > 2.41.0 > > > > > > > > > > -- > Efraim Flashner =D7=A8=D7=A0=D7=A9=D7=9C=D7= =A4 =D7=9D=D7=99=D7=A8=D7=A4=D7=90 > GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 > Confidentiality cannot be guaranteed on emails sent or received unencrypt= ed