Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 947c814aa895
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f2f1726a9f3b
Choose a head ref
  • 4 commits
  • 2 files changed
  • 1 contributor

Commits on Jun 4, 2019

  1. luaPackages.digestif: init at scm-1

    @teto
    teto committed Jun 4, 2019
    Copy the full SHA
    2fc71c7 View commit details

  2. luaPackages.lpeglabel: init at 1.5.0

    @teto
    teto committed Jun 4, 2019
    Copy the full SHA
    021e04d View commit details

  3. luaPackages.lua-lsp: init at scm-2

    @teto
    teto committed Jun 4, 2019
    Copy the full SHA
    1b2e667 View commit details

Commits on Jun 5, 2019

  1. Merge pull request #62669 from teto/lua-lsp 

    Add one latex and one lua LSP server
    @teto
    teto authored Jun 5, 2019
    Copy the full SHA
    f2f1726 View commit details
Showing with 80 additions and 0 deletions.
  1. +3 −0 maintainers/scripts/luarocks-packages.csv
  2. +77 −0 pkgs/development/lua-modules/generated-packages.nix
3 changes: 3 additions & 0 deletions maintainers/scripts/luarocks-packages.csv
View file
Original file line number Diff line number Diff line change
@@ -3,20 +3,23 @@ ansicolors,,,,
argparse,,,,
basexx,,,,
binaryheap,,,,
digestif,,http://luarocks.org/dev,,lua5_3
dkjson,,,,
fifo,,,,
http,,,,
inspect,,,,
ldoc,,,,
lgi,,,,
lpeg_patterns,,,,
lpeglabel,,,,
lpty,,,,
lrexlib-gnu,,,,
lrexlib-posix,,,,
ltermbox,,,,
lua-cmsgpack,,,,
lua_cliargs,,,,
lua-iconv,,,,
lua-lsp,,http://luarocks.org/dev,,
lua-messagepack,,,,
lua-term,,,,
lua-toml,,,,
77 changes: 77 additions & 0 deletions pkgs/development/lua-modules/generated-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -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";