Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

luarocks-nix: bump #166162

Merged
merged 7 commits into from
Mar 31, 2022
Merged

luarocks-nix: bump #166162

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2c338f5
luarocks-nix: bump
Mar 29, 2022
8bb4179
luarocks: 3.2 -> 3.8
Mar 29, 2022
2e5732b
luaPackages.libuv: bump to v1.43.0
Mar 29, 2022
0986a70
lua.lib: small fix
Mar 29, 2022
d3dcc10
neovim: revert the linker changes that cause issues on nix
Mar 29, 2022
f80b906
neovim: cleanup a bit libluv related hacks
doronbehar Mar 29, 2022
eb54094
neovim: Explain more why tests are disabled
doronbehar Mar 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 9 additions & 13 deletions pkgs/applications/editors/neovim/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,6 @@ let
));

pyEnv = python3.withPackages(ps: with ps; [ pynvim msgpack ]);

# FIXME: this is verry messy and strange.
# see https://github.com/NixOS/nixpkgs/pull/80528
luv = lua.pkgs.luv;
luvpath = with builtins ; if stdenv.isDarwin
then "${luv.libluv}/lib/lua/${lua.luaversion}/libluv.${head (match "([0-9.]+).*" luv.version)}.dylib"
else "${luv}/lib/lua/${lua.luaversion}/luv.so";

in
stdenv.mkDerivation rec {
pname = "neovim-unwrapped";
Expand Down Expand Up @@ -57,7 +49,11 @@ in
libtermkey
libuv
libvterm-neovim
luv.libluv
# This is actually a c library, hence it's not included in neovimLuaEnv,
# see:
# https://github.com/luarocks/luarocks/issues/1402#issuecomment-1080616570
# and it's definition at: pkgs/development/lua-modules/overrides.nix
lua.pkgs.libluv
msgpack
ncurses
neovimLuaEnv
Expand Down Expand Up @@ -97,12 +93,12 @@ in
disallowedReferences = [ stdenv.cc ];

cmakeFlags = [
"-DGPERF_PRG=${gperf}/bin/gperf"
"-DLUA_PRG=${neovimLuaEnv.interpreter}"
"-DLIBLUV_LIBRARY=${luvpath}"
# Don't use downloaded dependencies. At the end of the configurePhase one
# can spot that cmake says this option was "not used by the project".
# That's because all dependencies were found and
# third-party/CMakeLists.txt is not read at all.
"-DUSE_BUNDLED=OFF"
]
++ optional doCheck "-DBUSTED_PRG=${neovimLuaEnv}/bin/busted"
teto marked this conversation as resolved.
Show resolved Hide resolved
++ optional (!lua.pkgs.isLuaJIT) "-DPREFER_LUA=ON"
;

Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/lua-modules/overrides.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ with prev;
});


# as advised in https://github.com/luarocks/luarocks/issues/1402
# as advised in https://github.com/luarocks/luarocks/issues/1402#issuecomment-1080616570
# we shouldn't use luarocks machinery to build complex cmake components
libluv = pkgs.stdenv.mkDerivation {

Expand Down