Skip to content

Commit

Permalink
build(nix): update flake to prevent build errors #28394
Browse files Browse the repository at this point in the history
- Updates nixpkgs to source a necessary Tree-sitter version
- Updates to a new llvm version as the old one was removed from nixpkgs
- Properly moves `doCheck` from a regular param to an attribute option
  • Loading branch information
ribru17 committed Apr 18, 2024
1 parent 345dcba commit 206475d
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 10 deletions.
12 changes: 6 additions & 6 deletions contrib/flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 3 additions & 4 deletions contrib/flake.nix
Expand Up @@ -88,9 +88,7 @@

# for neovim developers, beware of the slow binary
neovim-developer = let inherit (final.luaPackages) luacheck;
in (final.neovim-debug.override {
doCheck = final.stdenv.isLinux;
}).overrideAttrs (oa: {
in final.neovim-debug.overrideAttrs (oa: {
cmakeFlags = oa.cmakeFlags ++ [
"-DLUACHECK_PRG=${luacheck}/bin/luacheck"
"-DENABLE_LTO=OFF"
Expand All @@ -99,6 +97,7 @@
# https://clang.llvm.org/docs/AddressSanitizer.html#symbolizing-the-reports
"-DENABLE_ASAN_UBSAN=ON"
];
doCheck = final.stdenv.isLinux;
});
};
} // flake-utils.lib.eachDefaultSystem (system:
Expand Down Expand Up @@ -150,7 +149,7 @@
shellHook = oa.shellHook + ''
export NVIM_PYTHON_LOG_LEVEL=DEBUG
export NVIM_LOG_FILE=/tmp/nvim.log
export ASAN_SYMBOLIZER_PATH=${pkgs.llvm_11}/bin/llvm-symbolizer
export ASAN_SYMBOLIZER_PATH=${pkgs.llvm_18}/bin/llvm-symbolizer
# ASAN_OPTIONS=detect_leaks=1
export ASAN_OPTIONS="log_path=./test.log:abort_on_error=1"
Expand Down

0 comments on commit 206475d

Please sign in to comment.