diff options
Diffstat (limited to 'nixpkgs/doc/languages-frameworks')
-rw-r--r-- | nixpkgs/doc/languages-frameworks/lua.section.md | 5 | ||||
-rw-r--r-- | nixpkgs/doc/languages-frameworks/python.section.md | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/nixpkgs/doc/languages-frameworks/lua.section.md b/nixpkgs/doc/languages-frameworks/lua.section.md index 310ea88a86d5..23c40409eaa0 100644 --- a/nixpkgs/doc/languages-frameworks/lua.section.md +++ b/nixpkgs/doc/languages-frameworks/lua.section.md @@ -215,6 +215,11 @@ install the package environment variable and add dependent libraries to script's `LUA_PATH` and `LUA_CPATH`. +It accepts as arguments: + +* 'luarocksConfig': a nix value that directly maps to the luarocks config used during + the installation + By default `meta.platforms` is set to the same value as the interpreter unless overridden otherwise. #### `buildLuaApplication` function {#buildluaapplication-function} diff --git a/nixpkgs/doc/languages-frameworks/python.section.md b/nixpkgs/doc/languages-frameworks/python.section.md index da06fe1d69b5..d1b41d84ddc7 100644 --- a/nixpkgs/doc/languages-frameworks/python.section.md +++ b/nixpkgs/doc/languages-frameworks/python.section.md @@ -475,7 +475,7 @@ are used in [`buildPythonPackage`](#buildpythonpackage-function). be added as `build-system`. - `pipInstallHook` to install wheels. - `pytestCheckHook` to run tests with `pytest`. See [example usage](#using-pytestcheckhook). -- `pythonCatchConflictsHook` to check whether a Python package is not already existing. +- `pythonCatchConflictsHook` to fail if the package depends on two different versions of the same dependency. - `pythonImportsCheckHook` to check whether importing the listed modules works. - `pythonRelaxDepsHook` will relax Python dependencies restrictions for the package. See [example usage](#using-pythonrelaxdepshook). |