Merge #314514: knot-resolver: add luaPackages.psl (e10170a3) · Commits · nix / nixpkgs

maintainers/scripts/luarocks-packages.csv

+1 −0

Original line number	Diff line number	Diff line
		@@ -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

+21 −0

Original line number	Diff line number	Diff line
		@@ -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";

+10 −0

Original line number	Diff line number	Diff line
		@@ -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

+2 −1

Original line number	Diff line number	Diff line
		@@ -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;