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: 3f9774c1d55a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5f3db033dfe0
Choose a head ref
  • 3 commits
  • 2 files changed
  • 1 contributor

Commits on Oct 23, 2019

  1. luaPackages.lualogging: init at 1.3.0-1 

    Dependency of luadoc
    @teto
    teto committed Oct 23, 2019
    Copy the full SHA
    af6bdae View commit details

  2. luaPackages.luadoc: init at 3.0.1-1 

    Used in vim plugins like nvim-terminal-lua to generate html docs.
    @teto
    teto committed Oct 23, 2019
    Copy the full SHA
    1581898 View commit details

Commits on Oct 24, 2019

  1. Merge pull request #71802 from teto/luadoc 

    adds Luadoc.
    @teto
    teto authored Oct 24, 2019
    Copy the full SHA
    5f3db03 View commit details
Showing with 38 additions and 0 deletions.
  1. +2 −0 maintainers/scripts/luarocks-packages.csv
  2. +36 −0 pkgs/development/lua-modules/generated-packages.nix
2 changes: 2 additions & 0 deletions maintainers/scripts/luarocks-packages.csv
View file
Original file line number Diff line number Diff line change
@@ -42,10 +42,12 @@ luadbi,,,,,
luadbi-mysql,,,,,
luadbi-postgresql,,,,,
luadbi-sqlite3,,,,,
luadoc,,,,,
luaevent,,,,,
luaexpat,,,1.3.0-1,,arobyn flosse
luaffi,,http://luarocks.org/dev,,,
luafilesystem,,,1.7.0-2,,flosse vcunat
lualogging,,,,,
luaossl,,,,lua5_1,vcunat
luaposix,,,,,vyp lblasc
luasec,,,,,flosse
36 changes: 36 additions & 0 deletions pkgs/development/lua-modules/generated-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -905,6 +905,24 @@ luadbi-sqlite3 = buildLuarocksPackage {
};
};
};
luadoc = buildLuarocksPackage {
pname = "luadoc";
version = "3.0.1-1";

src = fetchurl {
url = mirror://luarocks/luadoc-3.0.1-1.src.rock;
sha256 = "112zqjbzkrhx3nvavrxx3vhpv2ix85pznzzbpa8fq4piyv5r781i";
};
propagatedBuildInputs = [ lualogging luafilesystem ];

meta = with stdenv.lib; {
homepage = "http://luadoc.luaforge.net/";
description = "LuaDoc is a documentation tool for Lua source code";
license = {
fullName = "MIT/X11";
};
};
};
luaevent = buildLuarocksPackage {
pname = "luaevent";
version = "0.4.6-1";
@@ -983,6 +1001,24 @@ luafilesystem = buildLuarocksPackage {
};
};
};
lualogging = buildLuarocksPackage {
pname = "lualogging";
version = "1.3.0-1";

src = fetchurl {
url = mirror://luarocks/lualogging-1.3.0-1.src.rock;
sha256 = "13fm1vlig3zmbfkmlq1vk3xfqhlvv5xf24b0p4k4d08395y858vc";
};
propagatedBuildInputs = [ luasocket ];

meta = with stdenv.lib; {
homepage = "https://github.com/Neopallium/lualogging";
description = "A simple API to use logging features";
license = {
fullName = "MIT/X11";
};
};
};
luaossl = buildLuarocksPackage {
pname = "luaossl";
version = "20190731-0";