[bug#70146] [PATCH rust-team 000/147] tree-sitter: Update to 0.22.2.

[bug#70146] [PATCH rust-team 000/147] tree-sitter: Update to 0.22.2.

[Jean-Pierre De Jesus DIAZ]

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

[bug#70146] [PATCH rust-team 000/147] tree-sitter: Update to 0.22.2.

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 8590 bytes --]

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® VTune™ 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.patch
>  create mode 100644 gnu/packages/patches/tree-sitter-plantuml-package-json.patch
> 
> 
> base-commit: 7af70efd7633b0d70091762cf43ce01a86176e8e
> -- 
> 2.41.0
> 
> 
> 
> 

-- 
Efraim Flashner   <efraim@flashner.co.il>   רנשלפ םירפא
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#70146] [PATCH rust-team 000/147] tree-sitter: Update to 0.22.2.

[Jean-Pierre De Jesus Diaz]

>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 PM Efraim Flashner <efraim@flashner.co.il> 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® VTune™ 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.patch
> >  create mode 100644 gnu/packages/patches/tree-sitter-plantuml-package-json.patch
> >
> >
> > base-commit: 7af70efd7633b0d70091762cf43ce01a86176e8e
> > --
> > 2.41.0
> >
> >
> >
> >
>
> --
> Efraim Flashner   <efraim@flashner.co.il>   רנשלפ םירפא
> GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
> Confidentiality cannot be guaranteed on emails sent or received unencrypted

[bug#70146] Upstreaming wasmtime

[maya--- via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 623 bytes --]


Hi,

I just noticed you posted a patch that includes the wasmtime library. I
have just now finished a patch series on doing a similar thing (although
the goal was to provide wasmtime-cli).

I haven't noticed that you submitted the patch, since the last time I
checked it was 2 days ago :D

Can we perhaps coordinate that patchset to this one? I opted for
wasmtime-19 generally and also moved the ~100 packages into a new file
called cargo-compilation, but generally the packages have a huge
overlap.

Best regards,
Maya

PS. I also noticed that you remove the ittapi with a patch. That is
something I haven't done myself.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

[bug#70146] Upstreaming wasmtime

[Jean-Pierre De Jesus Diaz]

Hi,

>Can we perhaps coordinate that patchset to this one? I opted for
>wasmtime-19 generally and also moved the ~100 packages into a new file
>called cargo-compilation, but generally the packages have a huge
>overlap.

Sure, would like to, just not sure how to do it, I think it'd be
preferable to ask
comitters to merge yours first so that I can rebase and `inherit' from your
packages and not do it the other way around since it'd require more diff
lines.

I think the patch for ittapi should also work for rust-wasmtime-19 as the
Cargo.toml is generated pre processed by Cargo and should be more or
less the same.

I don't think I'll provide a wasmtime-cli for version 18 but the other crates
I'll do, unless you need it and I can then add those.

My patch series can wait a bit since I have to do some refactorings first.

Feel free to look at the synopses and descriptions of the packages though
since I changed them a bit from the default of the importer.

On Wed, Apr 3, 2024 at 7:59 PM <maya@zenmaya.xyz> wrote:
>
>
> Hi,
>
> I just noticed you posted a patch that includes the wasmtime library. I
> have just now finished a patch series on doing a similar thing (although
> the goal was to provide wasmtime-cli).
>
> I haven't noticed that you submitted the patch, since the last time I
> checked it was 2 days ago :D
>
> Can we perhaps coordinate that patchset to this one? I opted for
> wasmtime-19 generally and also moved the ~100 packages into a new file
> called cargo-compilation, but generally the packages have a huge
> overlap.
>
> Best regards,
> Maya
>
> PS. I also noticed that you remove the ittapi with a patch. That is
> something I haven't done myself.

[bug#70146] Upstreaming wasmtime

[Maya via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 1430 bytes --]

On 2024-04-05 10:03, Jean-Pierre De Jesus Diaz wrote:

> Sure, would like to, just not sure how to do it, I think it'd be
> preferable to ask
> comitters to merge yours first so that I can rebase and `inherit' from your
> packages and not do it the other way around since it'd require more diff
> lines.

One way could probably be to share a git repository for the time being,
with the shared code, so we can both upstream the relevant packages. I
would probably base it on yours, as you have done more manual work in
the way of adding descriptions and removed the ittapi.

But it is your call. I also cannot send more than 20 emails a day, due
to my provider's limits, so 120 commits are not very manageable for me
to send as a patch series.

> I don't think I'll provide a wasmtime-cli for version 18 but the other crates
> I'll do, unless you need it and I can then add those.

I think the most packages are pretty much the same. Maybe some patch
versions are bumped, which will need to bump them as well.

The second option on the course of actions is to just upstream
wasmtime-cli-18 after your patch series is merged, and bump the
necessary packages later. I don't want to burden you, I just want to
find a way for upstreaming both our work into guix.

As I would appreciate having wasmtime available in guix, but it can
wait. It was mostly an afternoon project of packaging and merging
changes and then I found your patch.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

[bug#70146] Upstreaming wasmtime

[Jean-Pierre De Jesus Diaz]

>One way could probably be to share a git repository for the time being,
>with the shared code, so we can both upstream the relevant packages. I
>would probably base it on yours, as you have done more manual work in
>the way of adding descriptions and removed the ittapi.

I've made this branch:

https://github.com/Foundation-Devices/guix-mirror/tree/wip/tree-sitter

It currently contains all of the patches in the patch series including
the tree-sitter ones.

I'll probably end up making another branch to rebase on the rust-team
branch as that can
potentially reduce the number of patches needed as some I did are
already there I think.

On Fri, Apr 5, 2024 at 1:36 PM Maya <maya@zenmaya.xyz> wrote:
>
> On 2024-04-05 10:03, Jean-Pierre De Jesus Diaz wrote:
>
> > Sure, would like to, just not sure how to do it, I think it'd be
> > preferable to ask
> > comitters to merge yours first so that I can rebase and `inherit' from your
> > packages and not do it the other way around since it'd require more diff
> > lines.
>
> One way could probably be to share a git repository for the time being,
> with the shared code, so we can both upstream the relevant packages. I
> would probably base it on yours, as you have done more manual work in
> the way of adding descriptions and removed the ittapi.
>
> But it is your call. I also cannot send more than 20 emails a day, due
> to my provider's limits, so 120 commits are not very manageable for me
> to send as a patch series.
>
> > I don't think I'll provide a wasmtime-cli for version 18 but the other crates
> > I'll do, unless you need it and I can then add those.
>
> I think the most packages are pretty much the same. Maybe some patch
> versions are bumped, which will need to bump them as well.
>
> The second option on the course of actions is to just upstream
> wasmtime-cli-18 after your patch series is merged, and bump the
> necessary packages later. I don't want to burden you, I just want to
> find a way for upstreaming both our work into guix.
>
> As I would appreciate having wasmtime available in guix, but it can
> wait. It was mostly an afternoon project of packaging and merging
> changes and then I found your patch.