summary refs log tree commit diff
path: root/doc/languages-frameworks
diff options
context:
space:
mode:
authorMatthieu Coudron <mcoudron@hotmail.com>2021-08-03 00:24:05 +0200
committerMatthieu Coudron <mcoudron@hotmail.com>2021-08-09 21:37:58 +0200
commitfa1dedee47f37c5df65589fcf47f307f9bfabd9e (patch)
tree87d1ed9cf9669069f1676b1356677437c22c7b11 /doc/languages-frameworks
parent560a4e4e086ea748a7836c62a167db959d3767d2 (diff)
downloadnixpkgs-fa1dedee47f37c5df65589fcf47f307f9bfabd9e.tar
nixpkgs-fa1dedee47f37c5df65589fcf47f307f9bfabd9e.tar.gz
nixpkgs-fa1dedee47f37c5df65589fcf47f307f9bfabd9e.tar.bz2
nixpkgs-fa1dedee47f37c5df65589fcf47f307f9bfabd9e.tar.lz
nixpkgs-fa1dedee47f37c5df65589fcf47f307f9bfabd9e.tar.xz
nixpkgs-fa1dedee47f37c5df65589fcf47f307f9bfabd9e.tar.zst
nixpkgs-fa1dedee47f37c5df65589fcf47f307f9bfabd9e.zip
doc: updated lua doc
mentions lua 5.4 + fixed an error
Diffstat (limited to 'doc/languages-frameworks')
-rw-r--r--doc/languages-frameworks/lua.section.md8
1 files changed, 3 insertions, 5 deletions
diff --git a/doc/languages-frameworks/lua.section.md b/doc/languages-frameworks/lua.section.md
index ea893ce3a4a..41fe0de04b4 100644
--- a/doc/languages-frameworks/lua.section.md
+++ b/doc/languages-frameworks/lua.section.md
@@ -139,11 +139,9 @@ the whitelist maintainers/scripts/luarocks-packages.csv and updated by running m
 [luarocks2nix](https://github.com/nix-community/luarocks) is a tool capable of generating nix derivations from both rockspec and src.rock (and favors the src.rock).
 The automation only goes so far though and some packages need to be customized.
 These customizations go in `pkgs/development/lua-modules/overrides.nix`.
-For instance if the rockspec defines `external_dependencies`, these need to be manually added in its rockspec file then it won't work.
+For instance if the rockspec defines `external_dependencies`, these need to be manually added to the overrides.nix.
 
 You can try converting luarocks packages to nix packages with the command `nix-shell -p luarocks-nix` and then `luarocks nix PKG_NAME`.
-Nix rely on luarocks to install lua packages, basically it runs:
-`luarocks make --deps-mode=none --tree $out`
 
 #### Packaging a library manually {#packaging-a-library-manually}
 
@@ -161,8 +159,8 @@ are not packaged for luarocks. You can see a few examples at `pkgs/top-level/lua
 
 ### Lua interpreters {#lua-interpreters}
 
-Versions 5.1, 5.2 and 5.3 of the lua interpreter are available as
-respectively `lua5_1`, `lua5_2` and `lua5_3`. Luajit is available too.
+Versions 5.1, 5.2, 5.3 and 5.4 of the lua interpreter are available as
+respectively `lua5_1`, `lua5_2`, `lua5_3` and `lua5_4`. Luajit is available too.
 The Nix expressions for the interpreters can be found in `pkgs/development/interpreters/lua-5`.
 
 #### Attributes on lua interpreters packages {#attributes-on-lua-interpreters-packages}