From dbd7c929f29759b02c004736009aa0ca3fc41c4e Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Tue, 23 Jun 2026 15:38:46 -0500 Subject: [PATCH] tree-sitter-grammars.tree-sitter-norg: mark wasi broken norg ships a C++ external scanner, which the WASM grammar build does not support (only C scanners are linked). Mark it broken on WASI so the wasi32 cross set skips it cleanly at eval instead of failing mid-build. --- pkgs/by-name/tr/tree-sitter/grammars/default.nix | 3 ++- pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix | 8 +++++++- pkgs/by-name/tr/tree-sitter/package.nix | 1 + 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/tr/tree-sitter/grammars/default.nix b/pkgs/by-name/tr/tree-sitter/grammars/default.nix index da1c049d0d7e..237e0fd99c6a 100644 --- a/pkgs/by-name/tr/tree-sitter/grammars/default.nix +++ b/pkgs/by-name/tr/tree-sitter/grammars/default.nix @@ -6,13 +6,14 @@ fetchpatch, fetchFromCodeberg, nix-update-script, + stdenv, }: let /** Set of grammar sources. See ./grammar-sources.nix to define a new grammar. */ - grammar-sources = import ./grammar-sources.nix { inherit lib fetchpatch; }; + grammar-sources = import ./grammar-sources.nix { inherit lib fetchpatch stdenv; }; /** Parse a flakeref style string to { type, owner, repo, ref } diff --git a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix index d2a78b5b174b..81bda82b084e 100644 --- a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix +++ b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix @@ -1,4 +1,8 @@ -{ fetchpatch, lib }: +{ + fetchpatch, + lib, + stdenv, +}: { @@ -1758,6 +1762,8 @@ url = "github:nvim-neorg/tree-sitter-norg"; hash = "sha256-z3h5qMuNKnpQgV62xZ02F5vWEq4VEnm5lxwEnIFu+Rw="; meta = { + # Uses a C++ external scanner, unsupported by the WASM grammar build. + broken = stdenv.hostPlatform.isWasi; license = lib.licenses.mit; }; }; diff --git a/pkgs/by-name/tr/tree-sitter/package.nix b/pkgs/by-name/tr/tree-sitter/package.nix index 72e6bb2c6784..cc4522b35f21 100644 --- a/pkgs/by-name/tr/tree-sitter/package.nix +++ b/pkgs/by-name/tr/tree-sitter/package.nix @@ -61,6 +61,7 @@ let fetchFromSourcehut fetchFromCodeberg fetchpatch + stdenv ; };