From 68d2661782302af165a001ea077b48baa21b0418 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Fri, 1 Nov 2024 20:27:24 +0100 Subject: [PATCH 1/2] lua-language-server: 3.11.1 -> 3.12.0 --- .../tools/language-servers/lua-language-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/language-servers/lua-language-server/default.nix b/pkgs/development/tools/language-servers/lua-language-server/default.nix index f3b40cfae31fb..be9894aaff763 100644 --- a/pkgs/development/tools/language-servers/lua-language-server/default.nix +++ b/pkgs/development/tools/language-servers/lua-language-server/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lua-language-server"; - version = "3.11.1"; + version = "3.12.0"; src = fetchFromGitHub { owner = "luals"; repo = "lua-language-server"; rev = finalAttrs.version; - hash = "sha256-ZYaiSBSnO9lPb/5pYa0OiL0KParuMb4/jIBtE3S/Ruo="; + hash = "sha256-wyQ4oXGemoT5QVZughFKd386RjzlW4ArtQL0ofMnhpU="; fetchSubmodules = true; }; From 9599296566c88826a42398af0981fe065d577aa0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sun, 3 Nov 2024 10:26:26 +0100 Subject: [PATCH 2/2] lua-language-server: disable flaky tests --- .../tools/language-servers/lua-language-server/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/tools/language-servers/lua-language-server/default.nix b/pkgs/development/tools/language-servers/lua-language-server/default.nix index be9894aaff763..88bde6ddfec87 100644 --- a/pkgs/development/tools/language-servers/lua-language-server/default.nix +++ b/pkgs/development/tools/language-servers/lua-language-server/default.nix @@ -39,6 +39,10 @@ stdenv.mkDerivation (finalAttrs: { # this feature is not used in lua-language-server sed -i /filewatch/d 3rd/bee.lua/test/test.lua + # flaky tests on linux + # https://github.com/LuaLS/lua-language-server/issues/2926 + sed -i /load-relative-library/d test/tclient/init.lua + pushd 3rd/luamake '' + lib.optionalString stdenv.hostPlatform.isDarwin ''