From 432af78ffd792257e601430f2f604c0d3e60cf8c Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 10 Nov 2024 23:18:47 +0100 Subject: [PATCH] tests/lsp-servers: disable lua-language-server on aarch64-darwin --- tests/lsp-servers.nix | 4 ++++ tests/test-sources/plugins/lsp/language-servers/lua-ls.nix | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/lsp-servers.nix b/tests/lsp-servers.nix index ba3bca13..69697959 100644 --- a/tests/lsp-servers.nix +++ b/tests/lsp-servers.nix @@ -50,6 +50,10 @@ 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 fba6959f..5bfe417b 100644 --- a/tests/test-sources/plugins/lsp/language-servers/lua-ls.nix +++ b/tests/test-sources/plugins/lsp/language-servers/lua-ls.nix @@ -5,8 +5,8 @@ enable = true; servers.lua_ls = { - # TODO: re-enable when x86_64-darwin build is stable - enable = pkgs.stdenv.isLinux || pkgs.stdenv.hostPlatform.isAarch64; + # TODO: 2024-11-10 fixed in https://github.com/NixOS/nixpkgs/pull/355032 + enable = pkgs.stdenv.isLinux || pkgs.stdenv.hostPlatform.isx86_64; settings = { addonManager = {