gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
nixpkgs-ci[bot]
2026-04-07 17:28:11 +00:00
committed by GitHub
parent 0591c59c5a 77bb0683a4
commit 43334c384f
53 changed files with 1209 additions and 984 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/lua-modules/overrides.nix
+13 -8
View File
@@ -240,10 +240,11 @@ in
# feel free to disable/adjust the tests
rm \
tests/base/test_apply.lua \
tests/base/test_vimscript_interpreter.lua \
# screenshot tests are brittle, as they are meant to be run against very
# specific Neovim/ripgrep/ast-grep versions.
tests/screenshot/*
tests/base/test_vimscript_interpreter.lua
# screenshot tests are brittle, as they are meant to be run against very
# specific Neovim/ripgrep/ast-grep versions.
rm -rf tests/screenshots/*
# Dependencies needed in special location
mkdir -p deps/{ripgrep,astgrep}
@@ -450,8 +451,10 @@ in
--replace-fail '"tree-sitter/lib/include",' '"${tree-sitter}/include"' \
--replace-fail '"tree-sitter/lib/src"' ""
'';
NIX_CFLAGS_COMPILE = "-I${tree-sitter}/include";
NIX_LDFLAGS = "-L${tree-sitter}/lib -ltree-sitter";
env = old.env // {
NIX_CFLAGS_COMPILE = "-I${tree-sitter}/include";
NIX_LDFLAGS = "-L${tree-sitter}/lib -ltree-sitter";
};
});
ltreesitter-ts = prev.ltreesitter-ts.overrideAttrs (old: {
@@ -465,8 +468,10 @@ in
hash = "sha256-hKM5HQU7A08mA004ZMV7hIVq/2WR3KocMatnTplM8uU=";
};
nativeBuildInputs = old.nativeBuildInputs ++ [ icu ];
NIX_CFLAGS_COMPILE = "-I${lib.getDev icu}/include";
NIX_LDFLAGS = "-L${lib.getLib icu}/lib -licuuc -licui18n -licudata";
env = old.env // {
NIX_CFLAGS_COMPILE = "-I${lib.getDev icu}/include";
NIX_LDFLAGS = "-L${lib.getLib icu}/lib -licuuc -licui18n -licudata";
};
});
lua-cmsgpack = prev.lua-cmsgpack.overrideAttrs {