From 9429b5692a0cf09f28d30e29ff80c7c6c915f717 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron <886074+teto@users.noreply.github.com> Date: Sat, 9 Sep 2023 02:24:54 +0200 Subject: luaPackages: update csv files - luaPackages.basexx: use upstream - luaPackages.nui-nvim: fix name in csv file --- maintainers/scripts/luarocks-packages.csv | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'maintainers/scripts') diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index f03ef4fa09c9..083470054eab 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -1,9 +1,9 @@ name,src,ref,server,version,luaversion,maintainers alt-getopt,,,,,,arobyn bit32,,,,5.3.0-1,5.1,lblasc -argparse,https://github.com/luarocks/argparse.git,,,,, -basexx,https://github.com/teto/basexx.git,,,,, -binaryheap,https://github.com/Tieske/binaryheap.lua,,,,,vcunat +argparse,,,,,, +basexx,,,,,, +binaryheap,,,,,,vcunat busted,,,,,, cassowary,,,,,,marsam alerque cldr,,,,,,alerque @@ -12,8 +12,8 @@ cosmo,,,,,,marsam coxpcall,,,,1.17.0-1,, cqueues,,,,,,vcunat cyan,,,,,, -cyrussasl,https://github.com/JorjBauer/lua-cyrussasl.git,,,,, -digestif,https://github.com/astoff/digestif.git,,,0.2-1,5.3, +cyrussasl,,,,,, +digestif,https://github.com/astoff/digestif.git,,,,5.3, dkjson,,,,,, fennel,,,,,,misterio77 ferris.nvim,,,,,,mrcjkb @@ -25,7 +25,7 @@ http,,,,0.3-0,,vcunat inspect,,,,,, jsregexp,,,,,, ldbus,,,http://luarocks.org/dev,,, -ldoc,https://github.com/stevedonovan/LDoc.git,,,,, +ldoc,,,,,, lgi,,,,,, linenoise,https://github.com/hoelzro/lua-linenoise.git,,,,, ljsyscall,,,,,5.1,lblasc @@ -41,7 +41,6 @@ lrexlib-posix,,,,,, lua-cjson,,,,,, lua-cmsgpack,,,,,, lua-curl,,,,,, -lua-iconv,,,,,, lua-lsp,,,,,, lua-messagepack,,,,,, lua-protobuf,,,,,,lockejan @@ -83,17 +82,18 @@ luaunit,,,,,,lockejan luautf8,,,,,,pstn luazip,,,,,, lua-yajl,,,,,,pstn +lua-iconv,,,,7.0.0,, luuid,,,,,, luv,,,,1.44.2-1,, lush.nvim,https://github.com/rktjmp/lush.nvim,,,,,teto lyaml,,,,,,lblasc -magick,,,,,,donovanglover +magick,,,,,5.1,donovanglover markdown,,,,,, mediator_lua,,,,,, middleclass,,,,,, mpack,,,,,, moonscript,https://github.com/leafo/moonscript.git,dev-1,,,,arobyn -nui-nvim,,,,,,mrcjkb +nui.nvim,,,,,,mrcjkb nvim-client,https://github.com/neovim/lua-client.git,,,,, nvim-cmp,https://github.com/hrsh7th/nvim-cmp,,,,, penlight,https://github.com/lunarmodules/Penlight.git,,,,,alerque @@ -105,7 +105,7 @@ say,https://github.com/Olivine-Labs/say.git,,,,, serpent,,,,,,lockejan sqlite,,,,,, std._debug,https://github.com/lua-stdlib/_debug.git,,,,, -std.normalize,https://github.com/lua-stdlib/normalize.git,,,,, +std.normalize,,,,,, stdlib,,,,41.2.2,,vyp teal-language-server,,,http://luarocks.org/dev,,, telescope.nvim,,,,,5.1, -- cgit 1.4.1 From e8dbe285c5be25e33e93bb6b0e5f05a11508c793 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron <886074+teto@users.noreply.github.com> Date: Sun, 15 Oct 2023 01:21:01 +0200 Subject: luaPackages.readline: moved out from the generated set --- maintainers/scripts/luarocks-packages.csv | 1 - pkgs/development/lua-modules/overrides.nix | 35 +++++++++++++++++++++++++----- 2 files changed, 29 insertions(+), 7 deletions(-) (limited to 'maintainers/scripts') diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 083470054eab..16f982601bb8 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -100,7 +100,6 @@ penlight,https://github.com/lunarmodules/Penlight.git,,,,,alerque plenary.nvim,https://github.com/nvim-lua/plenary.nvim.git,,,,5.1, rapidjson,https://github.com/xpol/lua-rapidjson.git,,,,, rest.nvim,,,,,5.1,teto -readline,,,,,, say,https://github.com/Olivine-Labs/say.git,,,,, serpent,,,,,,lockejan sqlite,,,,,, diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 62d4e066e50b..bd24eb501670 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -322,7 +322,7 @@ with prev; externalDeps = [ { name = "EVENT"; dep = libevent; } ]; - disabled = luaOlder "5.1" || luaAtLeast "5.4"; + meta.broken = luaOlder "5.1" || luaAtLeast "5.4"; }); luaexpat = prev.luaexpat.overrideAttrs (_: { @@ -514,8 +514,21 @@ with prev; ''; }); - readline = prev.readline.overrideAttrs (oa: { - propagatedBuildInputs = oa.propagatedBuildInputs ++ [ readline.out ]; + readline = final.callPackage({ buildLuarocksPackage, fetchurl, luaAtLeast, luaOlder, lua, luaposix }: + buildLuarocksPackage ({ + pname = "readline"; + version = "3.2-0"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/readline-3.2-0.rockspec"; + sha256 = "1r0sgisxm4xd1r6i053iibxh30j7j3rcj4wwkd8rzkj8nln20z24"; + }).outPath; + src = fetchurl { + # the rockspec url doesn't work because 'www.' is not covered by the certificate so + # I manually removed the 'www' prefix here + url = "http://pjb.com.au/comp/lua/readline-3.2.tar.gz"; + sha256 = "1mk9algpsvyqwhnq7jlw4cgmfzj30l7n2r6ak4qxgdxgc39f48k4"; + }; + extraVariables = rec { READLINE_INCDIR = "${readline.dev}/include"; HISTORY_INCDIR = READLINE_INCDIR; @@ -524,9 +537,19 @@ with prev; unzip "$curSrc" tar xf *.tar.gz ''; - # Without this, source root is wrongly set to ./readline-2.6/doc - sourceRoot = "readline-${lib.versions.majorMinor oa.version}"; - }); + + disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); + propagatedBuildInputs = [ lua luaposix + readline.out + ]; + + meta = { + homepage = "http://pjb.com.au/comp/lua/readline.html"; + description = "Interface to the readline library"; + license.fullName = "MIT/X11"; + }; + })) {}; + sqlite = prev.sqlite.overrideAttrs (drv: { -- cgit 1.4.1 From 12776aa73661c9a7ad65ad2f6fbdd13d0463daab Mon Sep 17 00:00:00 2001 From: Matthieu Coudron <886074+teto@users.noreply.github.com> Date: Sun, 15 Oct 2023 03:04:27 +0200 Subject: update-luarocks-package: update script else nixpkgs-review fails --- maintainers/scripts/update-luarocks-packages | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'maintainers/scripts') diff --git a/maintainers/scripts/update-luarocks-packages b/maintainers/scripts/update-luarocks-packages index 32c2b44260b3..8045c46782cc 100755 --- a/maintainers/scripts/update-luarocks-packages +++ b/maintainers/scripts/update-luarocks-packages @@ -103,7 +103,7 @@ class LuaEditor(pluginupdate.Editor): header2 = textwrap.dedent( # header2 = inspect.cleandoc( """ - { self, stdenv, lib, fetchurl, fetchgit, callPackage, ... } @ args: + { stdenv, lib, fetchurl, fetchgit, callPackage, ... }: final: prev: { """ -- cgit 1.4.1 From db9d831c0b427c763469f9efc46fc847edf22ca6 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron <886074+teto@users.noreply.github.com> Date: Mon, 16 Oct 2023 18:25:35 +0200 Subject: luaPackages.lua-ff-zlib: init --- maintainers/scripts/luarocks-packages.csv | 1 + pkgs/development/lua-modules/overrides.nix | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'maintainers/scripts') diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 16f982601bb8..a6b25e5e0ecb 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -41,6 +41,7 @@ lrexlib-posix,,,,,, lua-cjson,,,,,, lua-cmsgpack,,,,,, lua-curl,,,,,, +lua-ffi-zlib,,,,,, lua-lsp,,,,,, lua-messagepack,,,,,, lua-protobuf,,,,,,lockejan diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 03b70fd1f9a9..8e35b5c1d6d1 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -386,10 +386,10 @@ with prev; ]; }); - lua-resty-session = prev.lua-resty-session.overrideAttrs (oa: { - # lua_pack and lua-ffi-zlib are unpackaged, causing this package to not evaluate - meta.broken = true; - }); + # lua-resty-session = prev.lua-resty-session.overrideAttrs (oa: { + # # lua_pack and lua-ffi-zlib are unpackaged, causing this package to not evaluate + # meta.broken = true; + # }); lua-yajl = prev.lua-yajl.overrideAttrs (oa: { buildInputs = oa.buildInputs ++ [ -- cgit 1.4.1 From 8b7a6ef57e6d8ef969d1de4cdd42d777c8d4ad29 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron <886074+teto@users.noreply.github.com> Date: Wed, 18 Oct 2023 20:46:09 +0200 Subject: luaPackages.cyrussasl: remove because broken/old and unused ? --- maintainers/scripts/luarocks-packages.csv | 1 - pkgs/development/lua-modules/aliases.nix | 3 ++- .../development/lua-modules/generated-packages.nix | 23 ---------------------- pkgs/development/lua-modules/overrides.nix | 6 ------ 4 files changed, 2 insertions(+), 31 deletions(-) (limited to 'maintainers/scripts') diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index a6b25e5e0ecb..2277a51dfbcb 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -12,7 +12,6 @@ cosmo,,,,,,marsam coxpcall,,,,1.17.0-1,, cqueues,,,,,,vcunat cyan,,,,,, -cyrussasl,,,,,, digestif,https://github.com/astoff/digestif.git,,,,5.3, dkjson,,,,,, fennel,,,,,,misterio77 diff --git a/pkgs/development/lua-modules/aliases.nix b/pkgs/development/lua-modules/aliases.nix index 47a097fd7f79..8f4ed9799c2c 100644 --- a/pkgs/development/lua-modules/aliases.nix +++ b/pkgs/development/lua-modules/aliases.nix @@ -39,5 +39,6 @@ let in mapAliases { - "lpty" = throw "lpy was removed because broken and unmaintained "; # added 2023-10-14 + lpty = throw "lpy was removed because broken and unmaintained "; # added 2023-10-14 + cyrussasl = throw "cyrussasl was removed because broken and unmaintained "; # added 2023-10-18 } diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index b56a496d72fc..2acbbc38a9b6 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -383,29 +383,6 @@ buildLuarocksPackage { }; }) {}; -cyrussasl = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: -buildLuarocksPackage { - pname = "cyrussasl"; - version = "1.1.0-3"; - knownRockspec = (fetchurl { - url = "mirror://luarocks/cyrussasl-1.1.0-3.rockspec"; - sha256 = "1nqklhi6ny44pg027s6jydgs6q0il99q29rlfs5k42kz72592p91"; - }).outPath; - src = fetchurl { - url = "https://github.com/JorjBauer/lua-cyrussasl"; - sha256 = "13piq5lw79g5bx2z80ak9k6756bi7c9hh1y963iavmw067ldr1mb"; - }; - - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; - - meta = { - homepage = "http://github.com/JorjBauer/lua-cyrussasl"; - description = "Cyrus SASL library for Lua 5.1+"; - license.fullName = "BSD"; - }; -}) {}; - digestif = callPackage({ buildLuarocksPackage, fetchgit, lpeg, lua, luaOlder, luafilesystem }: buildLuarocksPackage { pname = "digestif"; diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 8e35b5c1d6d1..66e92b58f859 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -117,12 +117,6 @@ with prev; ''; }); - cyrussasl = prev.cyrussasl.overrideAttrs (drv: { - externalDeps = [ - { name = "LIBSASL"; dep = cyrus_sasl; } - ]; - }); - fennel = prev.fennel.overrideAttrs(oa: { nativeBuildInputs = oa.nativeBuildInputs ++ [ installShellFiles -- cgit 1.4.1