cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

lua-language-server: rename from sumneko-lua-language-server

Browse source 
and add figsoda as a maintainer

lua-language-server has been moved to a new organization (LuaLS).
This commit is contained in:
figsoda 2023-02-06 22:43:34 -05:00
parent dfc0ceece3
commit 291887ff6e
4 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/editors/vscode/extensions/lua/default.nix
View file

@ -1,6 +1,6 @@
{ lib
, vscode-utils
, sumneko-lua-language-server
, lua-language-server
}:
vscode-utils.buildVscodeMarketplaceExtension {
@ -14,7 +14,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
patches = [ ./remove-chmod.patch ];
postInstall = ''
ln -sf ${sumneko-lua-language-server}/bin/lua-language-server \
ln -sf ${lua-language-server}/bin/lua-language-server \
$out/$installPrefix/server/bin/lua-language-server
'';

17
pkgs/development/tools/language-servers/sumneko-lua-language-server/default.nix → pkgs/development/tools/language-servers/lua-language-server/default.nix
View file

@ -1,9 +1,7 @@
{ lib, stdenv, fetchFromGitHub, ninja, makeWrapper, CoreFoundation, Foundation }:
let
target = if stdenv.isDarwin then "macOS" else "Linux";
in
stdenv.mkDerivation rec {
pname = "sumneko-lua-language-server";
pname = "lua-language-server";
version = "3.6.10";
src = fetchFromGitHub {
@ -45,7 +43,7 @@ stdenv.mkDerivation rec {
'';
ninjaFlags = [
"-fcompile/ninja/${lib.toLower target}.ninja"
"-fcompile/ninja/${if stdenv.isDarwin then "macos" else "linux"}.ninja"
];
postBuild = ''
@ -67,8 +65,8 @@ stdenv.mkDerivation rec {
makeWrapper "$out"/share/lua-language-server/bin/lua-language-server \
$out/bin/lua-language-server \
--add-flags "-E $out/share/lua-language-server/main.lua \
--logpath=\''${XDG_CACHE_HOME:-\$HOME/.cache}/sumneko_lua/log \
--metapath=\''${XDG_CACHE_HOME:-\$HOME/.cache}/sumneko_lua/meta"
--logpath=\''${XDG_CACHE_HOME:-\$HOME/.cache}/lua-language-server/log \
--metapath=\''${XDG_CACHE_HOME:-\$HOME/.cache}/lua-language-server/meta"
runHook postInstall
'';
@ -77,11 +75,10 @@ stdenv.mkDerivation rec {
__darwinAllowLocalNetworking = true;
meta = with lib; {
description = "Lua Language Server coded by Lua";
description = "A language server that offers Lua language support";
homepage = "https://github.com/luals/lua-language-server";
license = licenses.mit;
maintainers = with maintainers; [ sei40kr ];
maintainers = with maintainers; [ figsoda sei40kr ];
platforms = platforms.linux ++ platforms.darwin;
mainProgram = "lua-language-server";
};
}

1
pkgs/top-level/aliases.nix
View file

@ -1471,6 +1471,7 @@ mapAliases ({
subversion_1_10 = throw "subversion_1_10 has been removed as it has reached its end of life"; # Added 2022-04-26
subversion19 = throw "subversion19 has been removed as it has reached its end of life"; # Added 2021-03-31
sudolikeaboss = throw "sudolikeaboss is no longer maintained by upstream"; # Added 2022-04-16
sumneko-lua-language-server = lua-language-server; # Added 2023-02-07
sundials_3 = throw "sundials_3 was removed in 2020-02. outdated and no longer needed";
surf-webkit2 = throw "'surf-webkit2' has been renamed to/replaced by 'surf'"; # Converted to throw 2022-02-22
swec = throw "swec has been removed; broken and abandoned upstream"; # Added 2021-10-14

8
pkgs/top-level/all-packages.nix
View file

@ -16977,6 +16977,10 @@ with pkgs;
kotlin-language-server = callPackage ../development/tools/language-servers/kotlin-language-server { };
lua-language-server = darwin.apple_sdk_11_0.callPackage ../development/tools/language-servers/lua-language-server {
inherit (darwin.apple_sdk_11_0.frameworks) CoreFoundation Foundation;
};
metals = callPackage ../development/tools/language-servers/metals { };
millet = callPackage ../development/tools/language-servers/millet { };
@ -16985,10 +16989,6 @@ with pkgs;
rnix-lsp = callPackage ../development/tools/language-servers/rnix-lsp { };
sumneko-lua-language-server = darwin.apple_sdk_11_0.callPackage ../development/tools/language-servers/sumneko-lua-language-server {
inherit (darwin.apple_sdk_11_0.frameworks) CoreFoundation Foundation;
};
svls = callPackage ../development/tools/language-servers/svls { };
vala-language-server = callPackage ../development/tools/language-servers/vala-language-server { };