From 909b4f41d7339af3b3701cf9955376549b1c514d Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 17 Nov 2024 11:28:46 +0100 Subject: [PATCH] tests: re-enable lua-language-servers tests on all platforms This reverts commit 432af78ffd792257e601430f2f604c0d3e60cf8c. --- tests/lsp-servers.nix | 4 ---- tests/test-sources/plugins/lsp/language-servers/lua-ls.nix | 4 +--- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/tests/lsp-servers.nix b/tests/lsp-servers.nix index 69697959..ba3bca13 100644 --- a/tests/lsp-servers.nix +++ b/tests/lsp-servers.nix @@ -50,10 +50,6 @@ let # TODO: 2024-10-05 build failure "fstar" ] - ++ lib.optionals (pkgs.stdenv.hostPlatform.system == "aarch64-darwin") [ - # TODO: 2024-11-10 fixed in https://github.com/NixOS/nixpkgs/pull/355032 - "lua-language-server" - ] ++ lib.optionals (pkgs.stdenv.hostPlatform.system == "x86_64-darwin") [ # Binary package not available for this architecture "starpls" diff --git a/tests/test-sources/plugins/lsp/language-servers/lua-ls.nix b/tests/test-sources/plugins/lsp/language-servers/lua-ls.nix index 5bfe417b..0a925681 100644 --- a/tests/test-sources/plugins/lsp/language-servers/lua-ls.nix +++ b/tests/test-sources/plugins/lsp/language-servers/lua-ls.nix @@ -1,12 +1,10 @@ -{ pkgs, ... }: { defaults = { plugins.lsp = { enable = true; servers.lua_ls = { - # TODO: 2024-11-10 fixed in https://github.com/NixOS/nixpkgs/pull/355032 - enable = pkgs.stdenv.isLinux || pkgs.stdenv.hostPlatform.isx86_64; + enable = true; settings = { addonManager = {