From e4bb54b19da0473f1a8393ed32852ee6991e8d25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 28 Nov 2024 12:24:27 +0100 Subject: [PATCH 1/2] luarocks-bootstrap: cmake and zip should be nativeBuildInputs --- pkgs/development/tools/misc/luarocks/default.nix | 4 ++-- pkgs/development/tools/misc/luarocks/luarocks-nix.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/luarocks/default.nix b/pkgs/development/tools/misc/luarocks/default.nix index b15924b34f3c..f03e689233e3 100644 --- a/pkgs/development/tools/misc/luarocks/default.nix +++ b/pkgs/development/tools/misc/luarocks/default.nix @@ -87,12 +87,12 @@ stdenv.mkDerivation (finalAttrs: { --suffix LUA_PATH ";" "$(echo "$out"/share/lua/*/)?/init.lua" \ --suffix LUA_CPATH ";" "$(echo "$out"/lib/lua/*/)?.so" \ --suffix LUA_CPATH ";" "$(echo "$out"/share/lua/*/)?/init.lua" \ - --suffix PATH : ${lib.makeBinPath finalAttrs.propagatedBuildInputs} + --suffix PATH : ${lib.makeBinPath finalAttrs.propagatedNativeBuildInputs} } done ''; - propagatedBuildInputs = [ zip unzip cmake ]; + propagatedNativeBuildInputs = [ zip unzip cmake ]; # unpack hook for src.rock and rockspec files setupHook = ./setup-hook.sh; diff --git a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix index 1a0466596fdc..9441c40616a9 100644 --- a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix +++ b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix @@ -16,7 +16,7 @@ luarocks_bootstrap.overrideAttrs (old: { hash = "sha256-hsjv+jlLsoIDM4gB/0mFeoVu1YZ1I9ELDALLTEnlCF0="; }; - propagatedBuildInputs = old.propagatedBuildInputs ++ [ + propagatedNativeBuildInputs = old.propagatedNativeBuildInputs ++ [ file nurl ]; From 7b60fc781a6c06f93771373edb6f17783a3752be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 28 Nov 2024 12:54:32 +0100 Subject: [PATCH 2/2] neovim: disable ruby by default Looking at the ecosystem, I don't see many ruby plugins that would justify having ruby enabled by default. --- pkgs/applications/editors/neovim/utils.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/neovim/utils.nix b/pkgs/applications/editors/neovim/utils.nix index 946619698dbc..40f638076447 100644 --- a/pkgs/applications/editors/neovim/utils.nix +++ b/pkgs/applications/editors/neovim/utils.nix @@ -90,7 +90,7 @@ let /* the function you would have passed to lua.withPackages */ , extraLuaPackages ? (_: []) , withNodeJs ? false - , withRuby ? true + , withRuby ? false , vimAlias ? false , viAlias ? false , configure ? {}