diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 0091e93b7d58c..23497e6d80d7d 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -112,6 +112,7 @@ nvim-nio,,,,,,mrcjkb pathlib.nvim,,,,,, penlight,,,,,,alerque plenary.nvim,https://raw.githubusercontent.com/nvim-lua/plenary.nvim/master/plenary.nvim-scm-1.rockspec,,,,5.1, +psl,,,,0.3,, rapidjson,,,,,, rest.nvim,,,,,5.1,teto rocks.nvim,,,,,,mrcjkb diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 46f0d5310cfa8..276ee77363253 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -2662,6 +2662,27 @@ buildLuarocksPackage { }; }) {}; +psl = callPackage({ buildLuarocksPackage, fetchurl, fetchzip }: +buildLuarocksPackage { + pname = "psl"; + version = "0.3-0"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/psl-0.3-0.rockspec"; + sha256 = "1x7sc8n780k67v31bvqqxhh6ihy0k91zmp6xcxmkifr0gd008x9z"; + }).outPath; + src = fetchzip { + url = "https://github.com/daurnimator/lua-psl/archive/v0.3.zip"; + sha256 = "1x9zskjn6fp9343w9314104128ik4lbk98pg6zfhl1v35107m1jx"; + }; + + + meta = { + homepage = "https://github.com/daurnimator/lua-psl"; + description = "Bindings to libpsl, a C library that handles the Public Suffix List (PSL)"; + license.fullName = "MIT"; + }; +}) {}; + rapidjson = callPackage({ buildLuarocksPackage, cmake, fetchFromGitHub, fetchurl, luaOlder }: buildLuarocksPackage { pname = "rapidjson"; diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 7eea1ba9930c8..3d784f4765616 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -29,6 +29,7 @@ , libiconv , libmpack , libmysqlclient +, libpsl , libuuid , libuv , libxcrypt @@ -617,6 +618,15 @@ in dontPatchShebangs = true; }); + psl = prev.psl.overrideAttrs (drv: { + buildInputs = drv.buildInputs or [ ] ++ [ libpsl ]; + + luarocksConfig.variables = drv.luarocksConfig.variables // { + PSL_INCDIR = lib.getDev libpsl + "/include"; + PSL_DIR = lib.getLib libpsl; + }; + }); + rapidjson = prev.rapidjson.overrideAttrs (oa: { preBuild = '' sed -i '/set(CMAKE_CXX_FLAGS/d' CMakeLists.txt