summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthieu Coudron <mattator@gmail.com>2019-06-05 12:36:07 +0900
committerGitHub <noreply@github.com>2019-06-05 12:36:07 +0900
commitf2f1726a9f3b05d6031b6cd4d124632d205cde31 (patch)
tree2a619da8244265173ad8951dea7dfb4494667cf2
parent947c814aa8956d1039800da8c3eeec0b060d9f81 (diff)
parent1b2e667ad6859fc7251029f9f93fde86fd755f0b (diff)
downloadnixpkgs-f2f1726a9f3b05d6031b6cd4d124632d205cde31.tar
nixpkgs-f2f1726a9f3b05d6031b6cd4d124632d205cde31.tar.gz
nixpkgs-f2f1726a9f3b05d6031b6cd4d124632d205cde31.tar.bz2
nixpkgs-f2f1726a9f3b05d6031b6cd4d124632d205cde31.tar.lz
nixpkgs-f2f1726a9f3b05d6031b6cd4d124632d205cde31.tar.xz
nixpkgs-f2f1726a9f3b05d6031b6cd4d124632d205cde31.tar.zst
nixpkgs-f2f1726a9f3b05d6031b6cd4d124632d205cde31.zip
Merge pull request #62669 from teto/lua-lsp
Add one latex and one lua LSP server
-rw-r--r--maintainers/scripts/luarocks-packages.csv3
-rw-r--r--pkgs/development/lua-modules/generated-packages.nix77
2 files changed, 80 insertions, 0 deletions
diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv
index 0d6dcf13e79..0c52faef1bf 100644
--- a/maintainers/scripts/luarocks-packages.csv
+++ b/maintainers/scripts/luarocks-packages.csv
@@ -3,6 +3,7 @@ ansicolors,,,,
 argparse,,,,
 basexx,,,,
 binaryheap,,,,
+digestif,,http://luarocks.org/dev,,lua5_3
 dkjson,,,,
 fifo,,,,
 http,,,,
@@ -10,6 +11,7 @@ inspect,,,,
 ldoc,,,,
 lgi,,,,
 lpeg_patterns,,,,
+lpeglabel,,,,
 lpty,,,,
 lrexlib-gnu,,,,
 lrexlib-posix,,,,
@@ -17,6 +19,7 @@ ltermbox,,,,
 lua-cmsgpack,,,,
 lua_cliargs,,,,
 lua-iconv,,,,
+lua-lsp,,http://luarocks.org/dev,,
 lua-messagepack,,,,
 lua-term,,,,
 lua-toml,,,,
diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix
index 5d27d7360f3..e7557930f11 100644
--- a/pkgs/development/lua-modules/generated-packages.nix
+++ b/pkgs/development/lua-modules/generated-packages.nix
@@ -92,6 +92,35 @@ binaryheap = buildLuarocksPackage {
     };
   };
 };
+digestif = buildLuarocksPackage {
+  pname = "digestif";
+  version = "scm-1";
+
+  knownRockspec = (fetchurl {
+    url    = http://luarocks.org/dev/digestif-scm-1.rockspec;
+    sha256 = "18rixbni4hmrmh3qj3vpjbsphzdvchswajphc9ysm52ccpyzh687";
+  }).outPath;
+
+  src = fetchgit ( removeAttrs (builtins.fromJSON ''{
+  "url": "git://github.com/astoff/digestif",
+  "rev": "19442554ae18607707f09e6663d65bb8bb4ebb58",
+  "date": "2019-06-01T15:41:36+02:00",
+  "sha256": "1sglkgx2s1xc725h9b97jhfbi3scs32si83xss5m3n0xidwmlbzb",
+  "fetchSubmodules": true
+}
+ '') ["date"]) ;
+
+  disabled = (luaOlder "5.3");
+  propagatedBuildInputs = [ lua lpeg dkjson ];
+
+  meta = {
+    homepage = "https://github.com/astoff/digestif/";
+    description = "Code analyzer for TeX.";
+    license = {
+      fullName = "MIT";
+    };
+  };
+};
 dkjson = buildLuarocksPackage {
   pname = "dkjson";
   version = "2.5-2";
@@ -228,6 +257,25 @@ lpeg_patterns = buildLuarocksPackage {
     };
   };
 };
+lpeglabel = buildLuarocksPackage {
+  pname = "lpeglabel";
+  version = "1.5.0-1";
+
+  src = fetchurl {
+    url    = https://luarocks.org/lpeglabel-1.5.0-1.src.rock;
+    sha256 = "068mwvwwn5n69pdm04qnk354391w9mk34jsczxql0xi5qgmz6w8j";
+  };
+  disabled = (luaOlder "5.1");
+  propagatedBuildInputs = [ lua ];
+
+  meta = {
+    homepage = "https://github.com/sqmedeiros/lpeglabel/";
+    description = "Parsing Expression Grammars For Lua with Labeled Failures";
+    license = {
+      fullName = "MIT/X11";
+    };
+  };
+};
 lpty = buildLuarocksPackage {
   pname = "lpty";
   version = "1.2.2-1";
@@ -371,6 +419,35 @@ lua-iconv = buildLuarocksPackage {
     };
   };
 };
+lua-lsp = buildLuarocksPackage {
+  pname = "lua-lsp";
+  version = "scm-2";
+
+  knownRockspec = (fetchurl {
+    url    = http://luarocks.org/dev/lua-lsp-scm-2.rockspec;
+    sha256 = "0qk3i6j0km4d1fs61fxhkmnbxmgpq24nygr8wknl6hbj2kya25rb";
+  }).outPath;
+
+  src = fetchgit ( removeAttrs (builtins.fromJSON ''{
+  "url": "git://github.com/Alloyed/lua-lsp",
+  "rev": "0de511803ed616214333210a2d003cf05a64dc18",
+  "date": "2018-09-08T10:11:54-04:00",
+  "sha256": "15dnsyh5664vi7qn73y2r114rhs5l9lfi84pwqkq5cafkiiy49qa",
+  "fetchSubmodules": true
+}
+ '') ["date"]) ;
+
+  disabled = (luaOlder "5.1") || (luaAtLeast "5.4");
+  propagatedBuildInputs = [ lua dkjson lpeglabel inspect ];
+
+  meta = {
+    homepage = "https://github.com/Alloyed/lua-lsp";
+    description = "No summary";
+    license = {
+      fullName = "MIT";
+    };
+  };
+};
 lua-messagepack = buildLuarocksPackage {
   pname = "lua-messagepack";
   version = "0.5.1-2";