From dc405305731f506c80f44f3079cd2e55ebde4740 Mon Sep 17 00:00:00 2001 From: teto sse Date: Sat, 6 Apr 2024 03:11:56 +0200 Subject: [PATCH 1/2] luaPackages.nlua: disable patchShebangAuto the automatic shebang patch adds a -l in the shebang which nlua picks up and aborts saying it doesn't accept -l --- pkgs/development/lua-modules/overrides.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 31ff2e6e3c580..ce17a6f89ef38 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -480,7 +480,6 @@ in }; }); - plenary-nvim = prev.plenary-nvim.overrideAttrs (oa: { postPatch = '' sed -Ei lua/plenary/curl.lua \ @@ -585,6 +584,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 From a204cd05a1bdd471f4215207bf1421a06635affc Mon Sep 17 00:00:00 2001 From: teto sse Date: Sat, 6 Apr 2024 03:12:20 +0200 Subject: [PATCH 2/2] luaPackages.haskell-tools-nvim: enable tests limited to 5.1 as nlua uses neovim as lua interpreter, which is 5.1 --- pkgs/development/lua-modules/overrides.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index ce17a6f89ef38..45cd51b717538 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -480,6 +480,17 @@ 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 = '' sed -Ei lua/plenary/curl.lua \