Skip to content

knot-resolver: add luaPackages.psl #305154

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vcunat merged 2 commits into from
May 25, 2024
Merged

knot-resolver: add luaPackages.psl #305154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
12a5234
luaPackages.psl: init at 0.3
SuperSandro2000 Apr 18, 2024
f358fe9
knot-resolver: add luaPackages.psl
SuperSandro2000 Apr 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions maintainers/scripts/luarocks-packages.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
21 changes: 21 additions & 0 deletions pkgs/development/lua-modules/generated-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
10 changes: 10 additions & 0 deletions pkgs/development/lua-modules/overrides.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
, libiconv
, libmpack
, libmysqlclient
, libpsl
, libuuid
, libuv
, libxcrypt
Expand Down Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion pkgs/servers/dns/knot-resolver/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,8 @@ wrapped-full = runCommand unwrapped.name
# For http module, prefill module, trust anchor bootstrap.
# It brings lots of deps; some are useful elsewhere (e.g. cqueues).
http
# psl isn't in nixpkgs yet, but policy.slice_randomize_psl() seems not important.
# used by policy.slice_randomize_psl()
psl
];
preferLocalBuild = true;
allowSubstitutes = false;
Expand Down