From 5365e3650da6127118bf26febd23dd71ca72d9e9 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Fri, 24 Jan 2020 17:47:09 +0100 Subject: [PATCH 1/7] luaPackages.digestif: scm1 -> 0.2-1 Now it's a released package so no need to specify the manifest anymore. --- maintainers/scripts/luarocks-packages.csv | 2 +- .../lua-modules/generated-packages.nix | 22 +++++-------------- 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 526a928438d..49ebf3e5b42 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -11,7 +11,7 @@ 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 diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 4cff22a8d41..2a70baf8d3c 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -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"; }; From bc07d117f2ce6156ddc4b383d9ec94ef714d4dda Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Fri, 24 Jan 2020 18:18:30 +0100 Subject: [PATCH 2/7] luaPackages.linenoise: init at 0.9-1 --- maintainers/scripts/luarocks-packages.csv | 1 + .../lua-modules/generated-packages.nix | 25 +++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 49ebf3e5b42..f9b74b279e8 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -18,6 +18,7 @@ http,,,,,vcunat inspect,,,,, ldoc,,,,, lgi,,,,, +linenoise,,,,, ljsyscall,,,,lua5_1,lblasc lpeg,,,,,vyp lpeg_patterns,,,,, diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 2a70baf8d3c..d1e72b41cdd 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -402,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"; From 2edf9a03325f0b29a217900af9785a6bfee9e5cf Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Fri, 24 Jan 2020 20:55:00 +0100 Subject: [PATCH 3/7] luarocks-nix: fix generation when missing license vstruct rockspec doesnt contain a license, which made luarocks-nix crash. Bump luarocks nix to fix this. --- pkgs/development/tools/misc/luarocks/luarocks-nix.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix index 21611f05579..57f200fd0fc 100644 --- a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix +++ b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix @@ -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 From 460224d4cd350e6a77dcbc6dc233d7ffb933b2c3 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Fri, 24 Jan 2020 20:58:00 +0100 Subject: [PATCH 4/7] luaPackages.luaepnf: init at 0.3-1 --- maintainers/scripts/luarocks-packages.csv | 1 + .../lua-modules/generated-packages.nix | 21 ++++++++++++++++--- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index f9b74b279e8..73de7b518db 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -44,6 +44,7 @@ luadbi-mysql,,,,, luadbi-postgresql,,,,, luadbi-sqlite3,,,,, luadoc,,,,, +luaepnf,,,,, luaevent,,,,, luaexpat,,,1.3.0-1,,arobyn flosse luaffi,,http://luarocks.org/dev,,, diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index d1e72b41cdd..3e01b2f9757 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -933,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 { From a032a3ad90f7794977c10a95141e424b8211ecd9 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Fri, 24 Jan 2020 20:58:58 +0100 Subject: [PATCH 5/7] luaPackages.luarepl: init at 0.9-1 --- maintainers/scripts/luarocks-packages.csv | 1 + .../lua-modules/generated-packages.nix | 27 ++++++++++++++++--- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 73de7b518db..ceb47f57db5 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -52,6 +52,7 @@ luafilesystem,,,1.7.0-2,,flosse vcunat lualogging,,,,, luaossl,,,,lua5_1,vcunat luaposix,,,,,vyp lblasc +luarepl,,,,, luasec,,,,,flosse luasocket,,,,, luasql-sqlite3,,,,,vyp diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 3e01b2f9757..eaa0f41aadb 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -1083,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 { From 84a2134baad9859f6a9fab88edd1a22437ba600a Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Fri, 24 Jan 2020 21:19:22 +0100 Subject: [PATCH 6/7] luaPackages.vstruct: init at 2.0.2-1 --- maintainers/scripts/luarocks-packages.csv | 1 + .../lua-modules/generated-packages.nix | 20 ++++++++++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index ceb47f57db5..01e3150ede1 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -75,3 +75,4 @@ std__debug,std._debug,,,, std_normalize,std.normalize,,,, stdlib,,,,,vyp pulseaudio,,,,,doronbehar +vstruct,,,,, diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index eaa0f41aadb..9afd8ab6a6e 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -1536,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"; }; }; From 27c88c51e70d63e28bec35df27c3db4baead6d33 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Fri, 24 Jan 2020 21:20:26 +0100 Subject: [PATCH 7/7] 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. --- maintainers/scripts/update-luarocks-packages | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/scripts/update-luarocks-packages b/maintainers/scripts/update-luarocks-packages index 1a31d71086f..5c42080745e 100755 --- a/maintainers/scripts/update-luarocks-packages +++ b/maintainers/scripts/update-luarocks-packages @@ -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=$?