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: 300ee2889161
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 29b5473241ac
Choose a head ref
  • 8 commits
  • 4 files changed
  • 1 contributor

Commits on Jan 24, 2020

  1. luaPackages.digestif: scm1 -> 0.2-1 

    Now it's a released package so no need to specify the manifest anymore.
    @teto
    teto committed Jan 24, 2020
    Copy the full SHA
    5365e36 View commit details

  2. luaPackages.linenoise: init at 0.9-1

    @teto
    teto committed Jan 24, 2020
    Copy the full SHA
    bc07d11 View commit details

Commits on Jan 25, 2020

  1. luarocks-nix: fix generation when missing license 

    vstruct rockspec doesnt contain a license, which made luarocks-nix
crash. Bump luarocks nix to fix this.
    @teto
    teto committed Jan 25, 2020
    Copy the full SHA
    2edf9a0 View commit details

  2. luaPackages.luaepnf: init at 0.3-1

    @teto
    teto committed Jan 25, 2020
    Copy the full SHA
    460224d View commit details

  3. luaPackages.luarepl: init at 0.9-1

    @teto
    teto committed Jan 25, 2020
    Copy the full SHA
    a032a3a View commit details

  4. luaPackages.vstruct: init at 2.0.2-1

    @teto
    teto committed Jan 25, 2020
    Copy the full SHA
    84a2134 View commit details

  5. update-luarocks-packages: disable by default 

    Not only the binary `parallel` displays a re,inder to quote their
software but it systematically breaks update here regardless of my
network quality.
Better be slow than fail. If anyone can fix it, we may rollback this.
    @teto
    teto committed Jan 25, 2020
    Copy the full SHA
    27c88c5 View commit details

  6. Merge pull request #78432 from teto/lua_for_sile 

    Lua for sile
    @teto
    teto authored Jan 25, 2020
    Copy the full SHA
    29b5473 View commit details
6 changes: 5 additions & 1 deletion maintainers/scripts/luarocks-packages.csv
View file
Original file line number Diff line number Diff line change
@@ -11,13 +11,14 @@ compat53,,,,,vcunat
coxpcall,,,1.17.0-1,,
cqueues,,,,,vcunat
cyrussasl,,,,,vcunat
digestif,,http://luarocks.org/dev,,lua5_3,
digestif,,,,lua5_3,
dkjson,,,,,
fifo,,,,,
http,,,,,vcunat
inspect,,,,,
ldoc,,,,,
lgi,,,,,
linenoise,,,,,
ljsyscall,,,,lua5_1,lblasc
lpeg,,,,,vyp
lpeg_patterns,,,,,
@@ -43,13 +44,15 @@ luadbi-mysql,,,,,
luadbi-postgresql,,,,,
luadbi-sqlite3,,,,,
luadoc,,,,,
luaepnf,,,,,
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
luarepl,,,,,
luasec,,,,,flosse
luasocket,,,,,
luasql-sqlite3,,,,,vyp
@@ -72,3 +75,4 @@ std__debug,std._debug,,,,
std_normalize,std.normalize,,,,
stdlib,,,,,vyp
pulseaudio,,,,,doronbehar
vstruct,,,,,
2 changes: 1 addition & 1 deletion maintainers/scripts/update-luarocks-packages
View file
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@ export LUAROCKS_CONFIG="$NIXPKGS_PATH/maintainers/scripts/luarocks-config.lua"

# 10 is a pretty arbitrary number of simultaneous jobs, but it is generally
# impolite to hit a webserver with *too* many simultaneous connections :)
PARALLEL_JOBS=10
PARALLEL_JOBS=1

exit_trap() {
local lc="$BASH_COMMAND" rc=$?
115 changes: 90 additions & 25 deletions pkgs/development/lua-modules/generated-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -266,28 +266,18 @@ cyrussasl = 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": "51c321f1b68b77f648fa6adf356de48925f69fe0",
"date": "2019-06-08T15:03:33+02:00",
"sha256": "1c9cl81vfzirc325wipdy992yn20b8xv8nqzl5mdhyz8zfp84hs7",
"fetchSubmodules": true
}
'') ["date"]) ;
version = "0.2-1";

src = fetchurl {
url = mirror://luarocks/digestif-0.2-1.src.rock;
sha256 = "03blpj5lxlhmxa4hnj21sz7sc84g96igbc7r97yb2smmlbyq8hxd";
};
disabled = (luaOlder "5.3");
propagatedBuildInputs = [ lua lpeg dkjson ];

meta = with stdenv.lib; {
homepage = "https://github.com/astoff/digestif/";
description = "Code analyzer for TeX.";
description = "A code analyzer for TeX";
license = {
fullName = "MIT";
};
@@ -412,6 +402,31 @@ lgi = buildLuarocksPackage {
};
};
};
linenoise = buildLuarocksPackage {
pname = "linenoise";
version = "0.9-1";

knownRockspec = (fetchurl {
url = mirror://luarocks/linenoise-0.9-1.rockspec;
sha256 = "0wic8g0d066pj9k51farsvcdbnhry2hphvng68w9k4lh0zh45yg4";
}).outPath;

src = fetchurl {
url = https://github.com/hoelzro/lua-linenoise/archive/0.9.tar.gz;
sha256 = "177h6gbq89arwiwxah9943i8hl5gvd9wivnd1nhmdl7d8x0dn76c";
};

disabled = (luaOlder "5.1");
propagatedBuildInputs = [ lua ];

meta = with stdenv.lib; {
homepage = "https://github.com/hoelzro/lua-linenoise";
description = "A binding for the linenoise command line library";
license = {
fullName = "MIT/X11";
};
};
};
ljsyscall = buildLuarocksPackage {
pname = "ljsyscall";
version = "0.12-1";
@@ -918,9 +933,24 @@ luadoc = buildLuarocksPackage {
meta = with stdenv.lib; {
homepage = "http://luadoc.luaforge.net/";
description = "LuaDoc is a documentation tool for Lua source code";
license = {
fullName = "MIT/X11";
};
license.fullName = "MIT/X11";
};
};
luaepnf = buildLuarocksPackage {
pname = "luaepnf";
version = "0.3-1";

src = fetchurl {
url = mirror://luarocks/luaepnf-0.3-1.src.rock;
sha256 = "12z7radxk1dkyjqflr85sghywgc82xdg4mzb9mbwbrrqbnjw8mp5";
};
disabled = (luaOlder "5.1") || (luaAtLeast "5.4");
propagatedBuildInputs = [ lua lpeg ];

meta = with stdenv.lib; {
homepage = "http://siffiejoe.github.io/lua-luaepnf/";
description = "Extended PEG Notation Format (easy grammars for LPeg)";
license.fullName = "MIT";
};
};
luaevent = buildLuarocksPackage {
@@ -1053,9 +1083,30 @@ luaposix = buildLuarocksPackage {
homepage = "https://github.com/luaposix/luaposix/";
description = "Lua bindings for POSIX";
maintainers = with maintainers; [ vyp lblasc ];
license = {
fullName = "MIT/X11";
};
license.fullName = "MIT/X11";
};
};
luarepl = buildLuarocksPackage {
pname = "luarepl";
version = "0.9-1";

knownRockspec = (fetchurl {
url = mirror://luarocks/luarepl-0.9-1.rockspec;
sha256 = "1409lanxv4s8kq5rrh46dvld77ip33qzfn3vac3i9zpzbmgb5i8z";
}).outPath;

src = fetchurl {
url = https://github.com/hoelzro/lua-repl/archive/0.9.tar.gz;
sha256 = "04xka7b84d9mrz3gyf8ywhw08xp65v8jrnzs8ry8k9540aqs721w";
};

disabled = (luaOlder "5.1");
propagatedBuildInputs = [ lua ];

meta = with stdenv.lib; {
homepage = "https://github.com/hoelzro/lua-repl";
description = "A reusable REPL component for Lua, written in Lua";
license.fullName = "MIT/X11";
};
};
luasec = buildLuarocksPackage {
@@ -1485,9 +1536,23 @@ stdlib = buildLuarocksPackage {
homepage = "http://lua-stdlib.github.io/lua-stdlib";
description = "General Lua Libraries";
maintainers = with maintainers; [ vyp ];
license = {
fullName = "MIT/X11";
};
license.fullName = "MIT/X11";
};
};
vstruct = buildLuarocksPackage {
pname = "vstruct";
version = "2.0.2-1";

src = fetchurl {
url = mirror://luarocks/vstruct-2.0.2-1.src.rock;
sha256 = "05k1685618wh7vg8av92mh1i1rjqg15x12gifbp9kyqzc2nk3kzq";
};
disabled = (luaOlder "5.1") || (luaAtLeast "5.3");
propagatedBuildInputs = [ lua ];

meta = with stdenv.lib; {
homepage = "https://github.com/ToxicFrog/vstruct";
description = "Lua library to manipulate binary data";
};
};

6 changes: 3 additions & 3 deletions pkgs/development/tools/misc/luarocks/luarocks-nix.nix
View file
Original file line number Diff line number Diff line change
@@ -4,9 +4,9 @@ luarocks.overrideAttrs(old: {
version = "2019-09-07";
src = fetchFromGitHub {
owner = "nix-community";
repo = "luarocks";
rev = "fa7c367bcdad36768db5f19fd4fcdd9681a14429";
sha256 = "0kziwfw5gqq5xsckl7qf9wasaiy8rp42h5qrcnjx07qp47a9ldx7";
repo = "luarocks-nix";
rev = "73b8772e56fd39dfffda9e3b13e9eb31e93d5cde";
sha256 = "00jgshygw439pbaxg7yph3ijia6nid9r1br416wdbyl5wqhlhm1y";
};
patches = [
./darwin-3.1.3.patch