diff --git a/tests/lsp-servers.nix b/tests/lsp-servers.nix index 15e94536..9ea6331b 100644 --- a/tests/lsp-servers.nix +++ b/tests/lsp-servers.nix @@ -46,13 +46,6 @@ 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 9088ccb2..bd1acdfd 100644 --- a/tests/test-sources/plugins/by-name/none-ls/default.nix +++ b/tests/test-sources/plugins/by-name/none-ls/default.nix @@ -144,15 +144,6 @@ # 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 2d0b9ed9..a21ce9ff 100644 --- a/tests/test-sources/plugins/by-name/yazi/default.nix +++ b/tests/test-sources/plugins/by-name/yazi/default.nix @@ -1,16 +1,11 @@ -{ pkgs, ... }: { empty = { - # 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"; + plugins.yazi.enable = true; }; defaults = { plugins.yazi = { - # 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"; + enable = true; 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 a5e7b6c7..225dfb1c 100644 --- a/tests/test-sources/plugins/lsp/efmls-configs.nix +++ b/tests/test-sources/plugins/lsp/efmls-configs.nix @@ -32,16 +32,6 @@ # 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