From 38dd5b07a00331fffe60236970d914bd0eeaf7da Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 3 Nov 2024 12:32:45 +0100 Subject: [PATCH] tests/lsp-servers: disable tests impacted by broken _7zz on x86_64-linux --- tests/lsp-servers.nix | 7 +++++++ tests/test-sources/plugins/by-name/none-ls/default.nix | 9 +++++++++ tests/test-sources/plugins/by-name/yazi/default.nix | 9 +++++++-- tests/test-sources/plugins/lsp/efmls-configs.nix | 10 ++++++++++ 4 files changed, 33 insertions(+), 2 deletions(-) diff --git a/tests/lsp-servers.nix b/tests/lsp-servers.nix index 9ea6331b..15e94536 100644 --- a/tests/lsp-servers.nix +++ b/tests/lsp-servers.nix @@ -46,6 +46,13 @@ let # Broken "scheme_langserver" ] + ++ lib.optionals (pkgs.stdenv.hostPlatform.system == "x86_64-linux") [ + # Those LSP servers depend on pkgs._7zz which is broken as of 2024-11-03 + # Re-enable when https://github.com/NixOS/nixpkgs/pull/353272 lands on `nixos-unstable` + "phpactor" + "psalm" + "phan" + ] ++ lib.optionals (pkgs.stdenv.hostPlatform.system == "aarch64-linux") [ # Binary package not available for this architecture "starpls" diff --git a/tests/test-sources/plugins/by-name/none-ls/default.nix b/tests/test-sources/plugins/by-name/none-ls/default.nix index bd1acdfd..9088ccb2 100644 --- a/tests/test-sources/plugins/by-name/none-ls/default.nix +++ b/tests/test-sources/plugins/by-name/none-ls/default.nix @@ -144,6 +144,15 @@ # As of 2024-11-03, graalvm-ce (dependency of clj-kondo) is broken on x86_64-darwin "clj_kondo" ]) + ++ (lib.optionals (pkgs.stdenv.isLinux && pkgs.stdenv.isx86_64) [ + # TODO: phpPackages.php-cs-fixer is unavailable because its dependency _7zz is broken (as of 2024-11-03) + # Re-enable when https://github.com/NixOS/nixpkgs/pull/353272 lands on `nixos-unstable` + "phpcbf" + "phpcs" + "phpcsfixer" + "phpmd" + "phpstan" + ]) ++ (lib.optionals pkgs.stdenv.isAarch64 [ "semgrep" "smlfmt" diff --git a/tests/test-sources/plugins/by-name/yazi/default.nix b/tests/test-sources/plugins/by-name/yazi/default.nix index a21ce9ff..2d0b9ed9 100644 --- a/tests/test-sources/plugins/by-name/yazi/default.nix +++ b/tests/test-sources/plugins/by-name/yazi/default.nix @@ -1,11 +1,16 @@ +{ pkgs, ... }: { empty = { - plugins.yazi.enable = true; + # TODO: pkgs.yazi is unavailable because its dependency _7zz is broken (as of 2024-11-03) + # Re-enable when https://github.com/NixOS/nixpkgs/pull/353272 lands on `nixos-unstable` + plugins.yazi.enable = pkgs.stdenv.hostPlatform.system != "x86_64-linux"; }; defaults = { plugins.yazi = { - enable = true; + # TODO: pkgs.yazi is unavailable because its dependency _7zz is broken (as of 2024-11-03) + # Re-enable when https://github.com/NixOS/nixpkgs/pull/353272 lands on `nixos-unstable` + enable = pkgs.stdenv.hostPlatform.system != "x86_64-linux"; settings = { log_level = "off"; diff --git a/tests/test-sources/plugins/lsp/efmls-configs.nix b/tests/test-sources/plugins/lsp/efmls-configs.nix index 225dfb1c..a5e7b6c7 100644 --- a/tests/test-sources/plugins/lsp/efmls-configs.nix +++ b/tests/test-sources/plugins/lsp/efmls-configs.nix @@ -32,6 +32,16 @@ # re-enable after fixed "dmd" ] + ++ lib.optionals (system == "x86_64-linux") [ + # TODO: phpPackages.php-cs-fixer is unavailable because its dependency _7zz is broken (as of 2024-11-03) + # Re-enable when https://github.com/NixOS/nixpkgs/pull/353272 lands on `nixos-unstable` + "phan" + "phpcbf" + "phpcs" + "php_cs_fixer" + "phpstan" + "psalm" + ] ++ lib.optionals (system == "aarch64-linux") [ # Broken as of 2024-07-13 # TODO: re-enable this tests when fixed