From 4ab2b289b6a9d2b5d970d515c087c64cc2b24847 Mon Sep 17 00:00:00 2001 From: Matt Sturgeon Date: Thu, 13 Jun 2024 04:57:36 +0100 Subject: [PATCH] plugins/none-ls: more compatible gdtoolkit fix Nixpkgs renamed to gdtoolkit_3 & _4 without maintaining an alias! Out of sync lock files could be using either attr name... --- plugins/none-ls/servers.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/plugins/none-ls/servers.nix b/plugins/none-ls/servers.nix index 23397418..73215ef0 100644 --- a/plugins/none-ls/servers.nix +++ b/plugins/none-ls/servers.nix @@ -121,8 +121,11 @@ let erb_format = pkgs.rubyPackages.erb-formatter; fish_indent = pkgs.fish; format_r = pkgs.R; - gdformat = pkgs.gdtoolkit_4; - gdlint = pkgs.gdtoolkit_4; + # TODO: Added 2024-06-13; remove 2024-09-13 + # Nixpkgs renamed to _3 & _4 without maintaining an alias + # Out of sync lock files could be using either attr name... + gdformat = pkgs.gdtoolkit_4 or pkgs.gdtoolkit; + gdlint = pkgs.gdtoolkit_4 or pkgs.gdtoolkit; gitsigns = pkgs.git; gleam_format = pkgs.gleam; glslc = pkgs.shaderc;