diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-04-21 18:01:29 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-21 18:01:29 +0000 |
| commit | 3fc84a9b461e4175ad14a1626b1a5bbcbcf30c3d (patch) | |
| tree | 5f4b147291559bbd18c403822f90fee268752571 /pkgs/development/lua-modules/overrides.nix | |
| parent | 77d99f85c383ab8f7848156a0e3b8fd2d88c4dc6 (diff) | |
| parent | 57e792f9341f7d46b9c6056bee541ab7c0bfe30a (diff) | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/lua-modules/overrides.nix')
| -rw-r--r-- | pkgs/development/lua-modules/overrides.nix | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 00482b7074408..b4b2bfe4af6af 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -485,6 +485,16 @@ in }; }); + haskell-tools-nvim = prev.haskell-tools-nvim.overrideAttrs(oa: { + doCheck = lua.luaversion == "5.1"; + nativeCheckInputs = [ final.nlua final.busted ]; + checkPhase = '' + runHook preCheck + export HOME=$(mktemp -d) + busted --lua=nlua + runHook postCheck + ''; + }); plenary-nvim = prev.plenary-nvim.overrideAttrs (oa: { postPatch = '' @@ -590,6 +600,15 @@ in }; }); + nlua = prev.nlua.overrideAttrs(oa: { + + # patchShebang removes the nvim in nlua's shebang so we hardcode one + postFixup = '' + sed -i -e "1 s|.*|#\!${coreutils}/bin/env -S ${neovim-unwrapped}/bin/nvim -l|" "$out/bin/nlua" + ''; + dontPatchShebangs = true; + }); + rapidjson = prev.rapidjson.overrideAttrs (oa: { preBuild = '' sed -i '/set(CMAKE_CXX_FLAGS/d' CMakeLists.txt |