diff options
| author | tobil4sk <tobil4sk@outlook.com> | 2026-02-03 22:47:50 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-02-03 19:47:50 -0300 |
| commit | 47301d83aba58925e1b9594023621ebb27070cdb (patch) | |
| tree | 73021b5366687ec1683b9e66505e74f22f71d31b /src | |
| parent | acf1f47e7f1b1ecbc147e41cae51ddfd06ad898d (diff) | |
| download | luarocks-main.tar.gz luarocks-main.tar.bz2 luarocks-main.zip | |
Improve flexibility around vendored librariesmain
compat53 is vendored since #1757 as it is required to run luarocks with lua 5.1 or 5.2.
However, this introduced some issues as the GNUmakefile install rule places these in the same place where `luarocks install compat53` would install them. This means you get conflicts if you install the actual package:
```
Warning: /.../prefix/share/lua/5.1/compat53/init.lua is not tracked by this installation of LuaRocks. Moving it to /.../prefix/share/lua/5.1/compat53/init.lua~
Warning: /.../prefix/share/lua/5.1/compat53/module.lua is not tracked by this installation of LuaRocks. Moving it to /.../prefix/share/lua/5.1/compat53/module.lua~
Warning: /.../prefix/share/lua/5.1/compat53/file_mt.lua is not tracked by this installation of LuaRocks. Moving it to /.../prefix/share/lua/5.1/compat53/file_mt.lua~
```
It is also not ideal for linux package maintainers to include a vendored package, see: https://github.com/luarocks/luarocks/pull/1757#issuecomment-3409873412.
To solve these issues, this patchset makes the following changes:
- GNUmakefile now places the compat53 files under `luarocks/vendor/compat53` (which is added internally to the luarocks script's `package.path`). This way a user's installation of compat53 does not interfere at all with luarocks one.
- Added `--with-system-compat53` option to configure script for external packaging systems.
- Fixed install.bat's logic for deciding whether to vendor compat53, as the current script includes it for every version.
install.bat already places luarocks sources outside of LUAPATH, so that part can stay as is.
I've also inverted the version check to avoid the need for future patches like: #1850.
Diffstat (limited to '')
40 files changed, 35 insertions, 35 deletions
diff --git a/src/luarocks/admin/cmd/add.tl b/src/luarocks/admin/cmd/add.tl index 56be7044..0989c82b 100644 --- a/src/luarocks/admin/cmd/add.tl +++ b/src/luarocks/admin/cmd/add.tl | |||
| @@ -12,7 +12,7 @@ local fs = require("luarocks.fs") | |||
| 12 | local cache = require("luarocks.admin.cache") | 12 | local cache = require("luarocks.admin.cache") |
| 13 | local index = require("luarocks.admin.index") | 13 | local index = require("luarocks.admin.index") |
| 14 | 14 | ||
| 15 | local type Parser = require("luarocks.vendor.argparse").Parser | 15 | local type Parser = require("argparse").Parser |
| 16 | 16 | ||
| 17 | local type Args = require("luarocks.core.types.args").Args | 17 | local type Args = require("luarocks.core.types.args").Args |
| 18 | 18 | ||
diff --git a/src/luarocks/admin/cmd/make_manifest.tl b/src/luarocks/admin/cmd/make_manifest.tl index 8f6efd3c..26ee1f46 100644 --- a/src/luarocks/admin/cmd/make_manifest.tl +++ b/src/luarocks/admin/cmd/make_manifest.tl | |||
| @@ -12,7 +12,7 @@ local deps = require("luarocks.deps") | |||
| 12 | local fs = require("luarocks.fs") | 12 | local fs = require("luarocks.fs") |
| 13 | local dir = require("luarocks.dir") | 13 | local dir = require("luarocks.dir") |
| 14 | 14 | ||
| 15 | local type Parser = require("luarocks.vendor.argparse").Parser | 15 | local type Parser = require("argparse").Parser |
| 16 | 16 | ||
| 17 | local type Args = require("luarocks.core.types.args").Args | 17 | local type Args = require("luarocks.core.types.args").Args |
| 18 | 18 | ||
diff --git a/src/luarocks/admin/cmd/refresh_cache.tl b/src/luarocks/admin/cmd/refresh_cache.tl index b0be9984..a60cb6c0 100644 --- a/src/luarocks/admin/cmd/refresh_cache.tl +++ b/src/luarocks/admin/cmd/refresh_cache.tl | |||
| @@ -7,7 +7,7 @@ local cfg = require("luarocks.core.cfg") | |||
| 7 | local util = require("luarocks.util") | 7 | local util = require("luarocks.util") |
| 8 | local cache = require("luarocks.admin.cache") | 8 | local cache = require("luarocks.admin.cache") |
| 9 | 9 | ||
| 10 | local type Parser = require("luarocks.vendor.argparse").Parser | 10 | local type Parser = require("argparse").Parser |
| 11 | 11 | ||
| 12 | local type Args = require("luarocks.core.types.args").Args | 12 | local type Args = require("luarocks.core.types.args").Args |
| 13 | 13 | ||
diff --git a/src/luarocks/admin/cmd/remove.tl b/src/luarocks/admin/cmd/remove.tl index 0b1aa65b..1ba630f2 100644 --- a/src/luarocks/admin/cmd/remove.tl +++ b/src/luarocks/admin/cmd/remove.tl | |||
| @@ -12,7 +12,7 @@ local fs = require("luarocks.fs") | |||
| 12 | local cache = require("luarocks.admin.cache") | 12 | local cache = require("luarocks.admin.cache") |
| 13 | local index = require("luarocks.admin.index") | 13 | local index = require("luarocks.admin.index") |
| 14 | 14 | ||
| 15 | local type Parser = require("luarocks.vendor.argparse").Parser | 15 | local type Parser = require("argparse").Parser |
| 16 | 16 | ||
| 17 | local type Args = require("luarocks.core.types.args").Args | 17 | local type Args = require("luarocks.core.types.args").Args |
| 18 | 18 | ||
diff --git a/src/luarocks/cmd.lua b/src/luarocks/cmd.lua index 4890593d..ed757276 100644 --- a/src/luarocks/cmd.lua +++ b/src/luarocks/cmd.lua | |||
| @@ -20,7 +20,7 @@ local cfg = require("luarocks.core.cfg") | |||
| 20 | local dir = require("luarocks.dir") | 20 | local dir = require("luarocks.dir") |
| 21 | local fun = require("luarocks.fun") | 21 | local fun = require("luarocks.fun") |
| 22 | local fs = require("luarocks.fs") | 22 | local fs = require("luarocks.fs") |
| 23 | local argparse = require("luarocks.vendor.argparse") | 23 | local argparse = require("argparse") |
| 24 | 24 | ||
| 25 | 25 | ||
| 26 | 26 | ||
diff --git a/src/luarocks/cmd.tl b/src/luarocks/cmd.tl index 6645e583..3f743bb6 100644 --- a/src/luarocks/cmd.tl +++ b/src/luarocks/cmd.tl | |||
| @@ -20,7 +20,7 @@ local cfg = require("luarocks.core.cfg") | |||
| 20 | local dir = require("luarocks.dir") | 20 | local dir = require("luarocks.dir") |
| 21 | local fun = require("luarocks.fun") | 21 | local fun = require("luarocks.fun") |
| 22 | local fs = require("luarocks.fs") | 22 | local fs = require("luarocks.fs") |
| 23 | local argparse = require("luarocks.vendor.argparse") | 23 | local argparse = require("argparse") |
| 24 | 24 | ||
| 25 | local type Tree = require("luarocks.core.types.tree").Tree | 25 | local type Tree = require("luarocks.core.types.tree").Tree |
| 26 | 26 | ||
diff --git a/src/luarocks/cmd/build.tl b/src/luarocks/cmd/build.tl index 31e9bee9..8cad506c 100644 --- a/src/luarocks/cmd/build.tl +++ b/src/luarocks/cmd/build.tl | |||
| @@ -19,7 +19,7 @@ local search = require("luarocks.search") | |||
| 19 | local make = require("luarocks.cmd.make") | 19 | local make = require("luarocks.cmd.make") |
| 20 | local repos = require("luarocks.repos") | 20 | local repos = require("luarocks.repos") |
| 21 | 21 | ||
| 22 | local type Parser = require("luarocks.vendor.argparse").Parser | 22 | local type Parser = require("argparse").Parser |
| 23 | 23 | ||
| 24 | local type Args = require("luarocks.core.types.args").Args | 24 | local type Args = require("luarocks.core.types.args").Args |
| 25 | local type BOpts = require("luarocks.core.types.bopts").BOpts | 25 | local type BOpts = require("luarocks.core.types.bopts").BOpts |
diff --git a/src/luarocks/cmd/config.lua b/src/luarocks/cmd/config.lua index 4ab40081..e8bda657 100644 --- a/src/luarocks/cmd/config.lua +++ b/src/luarocks/cmd/config.lua | |||
| @@ -10,7 +10,7 @@ local util = require("luarocks.util") | |||
| 10 | local deps = require("luarocks.deps") | 10 | local deps = require("luarocks.deps") |
| 11 | local dir = require("luarocks.dir") | 11 | local dir = require("luarocks.dir") |
| 12 | local fs = require("luarocks.fs") | 12 | local fs = require("luarocks.fs") |
| 13 | local json = require("luarocks.vendor.dkjson") | 13 | local json = require("dkjson") |
| 14 | 14 | ||
| 15 | 15 | ||
| 16 | 16 | ||
diff --git a/src/luarocks/cmd/config.tl b/src/luarocks/cmd/config.tl index cdda3fb9..66b60944 100644 --- a/src/luarocks/cmd/config.tl +++ b/src/luarocks/cmd/config.tl | |||
| @@ -10,9 +10,9 @@ local util = require("luarocks.util") | |||
| 10 | local deps = require("luarocks.deps") | 10 | local deps = require("luarocks.deps") |
| 11 | local dir = require("luarocks.dir") | 11 | local dir = require("luarocks.dir") |
| 12 | local fs = require("luarocks.fs") | 12 | local fs = require("luarocks.fs") |
| 13 | local json = require("luarocks.vendor.dkjson") | 13 | local json = require("dkjson") |
| 14 | 14 | ||
| 15 | local type Parser = require("luarocks.vendor.argparse").Parser | 15 | local type Parser = require("argparse").Parser |
| 16 | 16 | ||
| 17 | local type Args = require("luarocks.core.types.args").Args | 17 | local type Args = require("luarocks.core.types.args").Args |
| 18 | 18 | ||
diff --git a/src/luarocks/cmd/doc.tl b/src/luarocks/cmd/doc.tl index 9e7bee2a..b8a1667c 100644 --- a/src/luarocks/cmd/doc.tl +++ b/src/luarocks/cmd/doc.tl | |||
| @@ -13,7 +13,7 @@ local fetch = require("luarocks.fetch") | |||
| 13 | local fs = require("luarocks.fs") | 13 | local fs = require("luarocks.fs") |
| 14 | local download = require("luarocks.download") | 14 | local download = require("luarocks.download") |
| 15 | 15 | ||
| 16 | local type Parser = require("luarocks.vendor.argparse").Parser | 16 | local type Parser = require("argparse").Parser |
| 17 | 17 | ||
| 18 | local type Args = require("luarocks.core.types.args").Args | 18 | local type Args = require("luarocks.core.types.args").Args |
| 19 | local type Rockspec = require("luarocks.core.types.rockspec").Rockspec | 19 | local type Rockspec = require("luarocks.core.types.rockspec").Rockspec |
diff --git a/src/luarocks/cmd/download.tl b/src/luarocks/cmd/download.tl index 3b85443b..2e8175cb 100644 --- a/src/luarocks/cmd/download.tl +++ b/src/luarocks/cmd/download.tl | |||
| @@ -7,7 +7,7 @@ end | |||
| 7 | local util = require("luarocks.util") | 7 | local util = require("luarocks.util") |
| 8 | local download = require("luarocks.download") | 8 | local download = require("luarocks.download") |
| 9 | 9 | ||
| 10 | local type Parser = require("luarocks.vendor.argparse").Parser | 10 | local type Parser = require("argparse").Parser |
| 11 | 11 | ||
| 12 | local type Args = require("luarocks.core.types.args").Args | 12 | local type Args = require("luarocks.core.types.args").Args |
| 13 | 13 | ||
diff --git a/src/luarocks/cmd/init.tl b/src/luarocks/cmd/init.tl index 313c6df9..5846f96f 100644 --- a/src/luarocks/cmd/init.tl +++ b/src/luarocks/cmd/init.tl | |||
| @@ -12,7 +12,7 @@ local util = require("luarocks.util") | |||
| 12 | local persist = require("luarocks.persist") | 12 | local persist = require("luarocks.persist") |
| 13 | local write_rockspec = require("luarocks.cmd.write_rockspec") | 13 | local write_rockspec = require("luarocks.cmd.write_rockspec") |
| 14 | 14 | ||
| 15 | local type Parser = require("luarocks.vendor.argparse").Parser | 15 | local type Parser = require("argparse").Parser |
| 16 | 16 | ||
| 17 | local type Args = require("luarocks.core.types.args").Args | 17 | local type Args = require("luarocks.core.types.args").Args |
| 18 | 18 | ||
diff --git a/src/luarocks/cmd/install.tl b/src/luarocks/cmd/install.tl index 95d42f8e..8ed54a89 100644 --- a/src/luarocks/cmd/install.tl +++ b/src/luarocks/cmd/install.tl | |||
| @@ -17,7 +17,7 @@ local search = require("luarocks.search") | |||
| 17 | local queries = require("luarocks.queries") | 17 | local queries = require("luarocks.queries") |
| 18 | local cfg = require("luarocks.core.cfg") | 18 | local cfg = require("luarocks.core.cfg") |
| 19 | 19 | ||
| 20 | local type Parser = require("luarocks.vendor.argparse").Parser | 20 | local type Parser = require("argparse").Parser |
| 21 | 21 | ||
| 22 | local type Args = require("luarocks.core.types.args").Args | 22 | local type Args = require("luarocks.core.types.args").Args |
| 23 | local type IOpts = require("luarocks.core.types.installs").IOpts | 23 | local type IOpts = require("luarocks.core.types.installs").IOpts |
diff --git a/src/luarocks/cmd/lint.tl b/src/luarocks/cmd/lint.tl index 116dba12..247610cf 100644 --- a/src/luarocks/cmd/lint.tl +++ b/src/luarocks/cmd/lint.tl | |||
| @@ -8,7 +8,7 @@ local util = require("luarocks.util") | |||
| 8 | local download = require("luarocks.download") | 8 | local download = require("luarocks.download") |
| 9 | local fetch = require("luarocks.fetch") | 9 | local fetch = require("luarocks.fetch") |
| 10 | 10 | ||
| 11 | local type Parser = require("luarocks.vendor.argparse").Parser | 11 | local type Parser = require("argparse").Parser |
| 12 | 12 | ||
| 13 | local type Args = require("luarocks.core.types.args").Args | 13 | local type Args = require("luarocks.core.types.args").Args |
| 14 | 14 | ||
diff --git a/src/luarocks/cmd/list.tl b/src/luarocks/cmd/list.tl index 9a0948f0..f47c7889 100644 --- a/src/luarocks/cmd/list.tl +++ b/src/luarocks/cmd/list.tl | |||
| @@ -19,7 +19,7 @@ local path = require("luarocks.path") | |||
| 19 | 19 | ||
| 20 | local type Outdated = list.Outdated | 20 | local type Outdated = list.Outdated |
| 21 | 21 | ||
| 22 | local type Parser = require("luarocks.vendor.argparse").Parser | 22 | local type Parser = require("argparse").Parser |
| 23 | 23 | ||
| 24 | local type Args = require("luarocks.core.types.args").Args | 24 | local type Args = require("luarocks.core.types.args").Args |
| 25 | 25 | ||
diff --git a/src/luarocks/cmd/make.tl b/src/luarocks/cmd/make.tl index fc467b31..e77c523b 100644 --- a/src/luarocks/cmd/make.tl +++ b/src/luarocks/cmd/make.tl | |||
| @@ -17,7 +17,7 @@ local deps = require("luarocks.deps") | |||
| 17 | local dir = require("luarocks.dir") | 17 | local dir = require("luarocks.dir") |
| 18 | local fs = require("luarocks.fs") | 18 | local fs = require("luarocks.fs") |
| 19 | 19 | ||
| 20 | local type Parser = require("luarocks.vendor.argparse").Parser | 20 | local type Parser = require("argparse").Parser |
| 21 | 21 | ||
| 22 | local type Args = require("luarocks.core.types.args").Args | 22 | local type Args = require("luarocks.core.types.args").Args |
| 23 | 23 | ||
diff --git a/src/luarocks/cmd/new_version.tl b/src/luarocks/cmd/new_version.tl index d929376b..bf66b72c 100644 --- a/src/luarocks/cmd/new_version.tl +++ b/src/luarocks/cmd/new_version.tl | |||
| @@ -12,7 +12,7 @@ local fs = require("luarocks.fs") | |||
| 12 | local dir = require("luarocks.dir") | 12 | local dir = require("luarocks.dir") |
| 13 | local type_rockspec = require("luarocks.type.rockspec") | 13 | local type_rockspec = require("luarocks.type.rockspec") |
| 14 | 14 | ||
| 15 | local type Parser = require("luarocks.vendor.argparse").Parser | 15 | local type Parser = require("argparse").Parser |
| 16 | 16 | ||
| 17 | local type Args = require("luarocks.core.types.args").Args | 17 | local type Args = require("luarocks.core.types.args").Args |
| 18 | 18 | ||
diff --git a/src/luarocks/cmd/pack.tl b/src/luarocks/cmd/pack.tl index 750ae9c9..0d41a7eb 100644 --- a/src/luarocks/cmd/pack.tl +++ b/src/luarocks/cmd/pack.tl | |||
| @@ -8,7 +8,7 @@ local util = require("luarocks.util") | |||
| 8 | local pack = require("luarocks.pack") | 8 | local pack = require("luarocks.pack") |
| 9 | local queries = require("luarocks.queries") | 9 | local queries = require("luarocks.queries") |
| 10 | 10 | ||
| 11 | local type Parser = require("luarocks.vendor.argparse").Parser | 11 | local type Parser = require("argparse").Parser |
| 12 | 12 | ||
| 13 | local type Args = require("luarocks.core.types.args").Args | 13 | local type Args = require("luarocks.core.types.args").Args |
| 14 | 14 | ||
diff --git a/src/luarocks/cmd/path.tl b/src/luarocks/cmd/path.tl index 998aa222..13e75373 100644 --- a/src/luarocks/cmd/path.tl +++ b/src/luarocks/cmd/path.tl | |||
| @@ -8,7 +8,7 @@ local util = require("luarocks.util") | |||
| 8 | local cfg = require("luarocks.core.cfg") | 8 | local cfg = require("luarocks.core.cfg") |
| 9 | local fs = require("luarocks.fs") | 9 | local fs = require("luarocks.fs") |
| 10 | 10 | ||
| 11 | local type Parser = require("luarocks.vendor.argparse").Parser | 11 | local type Parser = require("argparse").Parser |
| 12 | 12 | ||
| 13 | local type Args = require("luarocks.core.types.args").Args | 13 | local type Args = require("luarocks.core.types.args").Args |
| 14 | 14 | ||
diff --git a/src/luarocks/cmd/purge.tl b/src/luarocks/cmd/purge.tl index 2801f357..5cec693f 100644 --- a/src/luarocks/cmd/purge.tl +++ b/src/luarocks/cmd/purge.tl | |||
| @@ -14,7 +14,7 @@ local cfg = require("luarocks.core.cfg") | |||
| 14 | local remove = require("luarocks.remove") | 14 | local remove = require("luarocks.remove") |
| 15 | local queries = require("luarocks.queries") | 15 | local queries = require("luarocks.queries") |
| 16 | 16 | ||
| 17 | local type Parser = require("luarocks.vendor.argparse").Parser | 17 | local type Parser = require("argparse").Parser |
| 18 | 18 | ||
| 19 | local type Args = require("luarocks.core.types.args").Args | 19 | local type Args = require("luarocks.core.types.args").Args |
| 20 | 20 | ||
diff --git a/src/luarocks/cmd/remove.tl b/src/luarocks/cmd/remove.tl index 77ee359d..af1fbe6b 100644 --- a/src/luarocks/cmd/remove.tl +++ b/src/luarocks/cmd/remove.tl | |||
| @@ -13,7 +13,7 @@ local path = require("luarocks.path") | |||
| 13 | local deps = require("luarocks.deps") | 13 | local deps = require("luarocks.deps") |
| 14 | local queries = require("luarocks.queries") | 14 | local queries = require("luarocks.queries") |
| 15 | 15 | ||
| 16 | local type Parser = require("luarocks.vendor.argparse").Parser | 16 | local type Parser = require("argparse").Parser |
| 17 | 17 | ||
| 18 | local type Args = require("luarocks.core.types.args").Args | 18 | local type Args = require("luarocks.core.types.args").Args |
| 19 | 19 | ||
diff --git a/src/luarocks/cmd/search.tl b/src/luarocks/cmd/search.tl index 7b27e8a1..6cf95bb4 100644 --- a/src/luarocks/cmd/search.tl +++ b/src/luarocks/cmd/search.tl | |||
| @@ -10,7 +10,7 @@ local search = require("luarocks.search") | |||
| 10 | local queries = require("luarocks.queries") | 10 | local queries = require("luarocks.queries") |
| 11 | local results = require("luarocks.results") | 11 | local results = require("luarocks.results") |
| 12 | 12 | ||
| 13 | local type Parser = require("luarocks.vendor.argparse").Parser | 13 | local type Parser = require("argparse").Parser |
| 14 | 14 | ||
| 15 | local type Args = require("luarocks.core.types.args").Args | 15 | local type Args = require("luarocks.core.types.args").Args |
| 16 | 16 | ||
diff --git a/src/luarocks/cmd/show.tl b/src/luarocks/cmd/show.tl index 56d70277..da93a74d 100644 --- a/src/luarocks/cmd/show.tl +++ b/src/luarocks/cmd/show.tl | |||
| @@ -22,7 +22,7 @@ local repos = require("luarocks.repos") | |||
| 22 | local type Return = show.Return | 22 | local type Return = show.Return |
| 23 | local type RenderData = {string: string | {string}} | 23 | local type RenderData = {string: string | {string}} |
| 24 | 24 | ||
| 25 | local type Parser = require("luarocks.vendor.argparse").Parser | 25 | local type Parser = require("argparse").Parser |
| 26 | 26 | ||
| 27 | local type Args = require("luarocks.core.types.args").Args | 27 | local type Args = require("luarocks.core.types.args").Args |
| 28 | 28 | ||
diff --git a/src/luarocks/cmd/test.tl b/src/luarocks/cmd/test.tl index a258e4a3..8e945987 100644 --- a/src/luarocks/cmd/test.tl +++ b/src/luarocks/cmd/test.tl | |||
| @@ -7,7 +7,7 @@ end | |||
| 7 | local util = require("luarocks.util") | 7 | local util = require("luarocks.util") |
| 8 | local test = require("luarocks.test") | 8 | local test = require("luarocks.test") |
| 9 | 9 | ||
| 10 | local type Parser = require("luarocks.vendor.argparse").Parser | 10 | local type Parser = require("argparse").Parser |
| 11 | 11 | ||
| 12 | local type Args = require("luarocks.core.types.args").Args | 12 | local type Args = require("luarocks.core.types.args").Args |
| 13 | 13 | ||
diff --git a/src/luarocks/cmd/unpack.tl b/src/luarocks/cmd/unpack.tl index 6d05ecde..5395fbee 100644 --- a/src/luarocks/cmd/unpack.tl +++ b/src/luarocks/cmd/unpack.tl | |||
| @@ -11,7 +11,7 @@ local build = require("luarocks.build") | |||
| 11 | local dir = require("luarocks.dir") | 11 | local dir = require("luarocks.dir") |
| 12 | local search = require("luarocks.search") | 12 | local search = require("luarocks.search") |
| 13 | 13 | ||
| 14 | local type Parser = require("luarocks.vendor.argparse").Parser | 14 | local type Parser = require("argparse").Parser |
| 15 | 15 | ||
| 16 | local type Args = require("luarocks.core.types.args").Args | 16 | local type Args = require("luarocks.core.types.args").Args |
| 17 | 17 | ||
diff --git a/src/luarocks/cmd/upload.tl b/src/luarocks/cmd/upload.tl index a12b30c0..edfe4f89 100644 --- a/src/luarocks/cmd/upload.tl +++ b/src/luarocks/cmd/upload.tl | |||
| @@ -20,7 +20,7 @@ local Api = require("luarocks.upload.api") | |||
| 20 | 20 | ||
| 21 | local type Response = upload.Response | 21 | local type Response = upload.Response |
| 22 | 22 | ||
| 23 | local type Parser = require("luarocks.vendor.argparse").Parser | 23 | local type Parser = require("argparse").Parser |
| 24 | 24 | ||
| 25 | local type Args = require("luarocks.core.types.args").Args | 25 | local type Args = require("luarocks.core.types.args").Args |
| 26 | local type Rockspec = require("luarocks.core.types.rockspec").Rockspec | 26 | local type Rockspec = require("luarocks.core.types.rockspec").Rockspec |
diff --git a/src/luarocks/cmd/which.tl b/src/luarocks/cmd/which.tl index 85a798ac..9b08acac 100644 --- a/src/luarocks/cmd/which.tl +++ b/src/luarocks/cmd/which.tl | |||
| @@ -8,7 +8,7 @@ local loader = require("luarocks.loader") | |||
| 8 | local cfg = require("luarocks.core.cfg") | 8 | local cfg = require("luarocks.core.cfg") |
| 9 | local util = require("luarocks.util") | 9 | local util = require("luarocks.util") |
| 10 | 10 | ||
| 11 | local type Parser = require("luarocks.vendor.argparse").Parser | 11 | local type Parser = require("argparse").Parser |
| 12 | 12 | ||
| 13 | local type Args = require("luarocks.core.types.args").Args | 13 | local type Args = require("luarocks.core.types.args").Args |
| 14 | 14 | ||
diff --git a/src/luarocks/cmd/write_rockspec.tl b/src/luarocks/cmd/write_rockspec.tl index 2ec4eea9..cb48ca3f 100644 --- a/src/luarocks/cmd/write_rockspec.tl +++ b/src/luarocks/cmd/write_rockspec.tl | |||
| @@ -12,7 +12,7 @@ local rockspecs = require("luarocks.rockspecs") | |||
| 12 | local type_rockspec = require("luarocks.type.rockspec") | 12 | local type_rockspec = require("luarocks.type.rockspec") |
| 13 | local util = require("luarocks.util") | 13 | local util = require("luarocks.util") |
| 14 | 14 | ||
| 15 | local type Parser = require("luarocks.vendor.argparse").Parser | 15 | local type Parser = require("argparse").Parser |
| 16 | 16 | ||
| 17 | local type Args = require("luarocks.core.types.args").Args | 17 | local type Args = require("luarocks.core.types.args").Args |
| 18 | 18 | ||
diff --git a/src/luarocks/core/persist.lua b/src/luarocks/core/persist.lua index c9ccb4a0..0d44aa16 100644 --- a/src/luarocks/core/persist.lua +++ b/src/luarocks/core/persist.lua | |||
| @@ -2,7 +2,7 @@ local _tl_compat; if (tonumber((_VERSION or ''):match('[%d.]*$')) or 0) < 5.3 th | |||
| 2 | local persist = {} | 2 | local persist = {} |
| 3 | 3 | ||
| 4 | 4 | ||
| 5 | local json = require("luarocks.vendor.dkjson") | 5 | local json = require("dkjson") |
| 6 | 6 | ||
| 7 | 7 | ||
| 8 | 8 | ||
diff --git a/src/luarocks/core/persist.tl b/src/luarocks/core/persist.tl index 268d2bb6..cafcfc60 100644 --- a/src/luarocks/core/persist.tl +++ b/src/luarocks/core/persist.tl | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | local record persist | 2 | local record persist |
| 3 | end | 3 | end |
| 4 | 4 | ||
| 5 | local json = require("luarocks.vendor.dkjson") | 5 | local json = require("dkjson") |
| 6 | 6 | ||
| 7 | -------------------------------------------------------------------------------- | 7 | -------------------------------------------------------------------------------- |
| 8 | 8 | ||
| @@ -64,7 +64,7 @@ function persist.load_into_table(filename: string, tbl?: {string:any}) : {string | |||
| 64 | setmetatable(result, save_mt) | 64 | setmetatable(result, save_mt) |
| 65 | 65 | ||
| 66 | if not ok then | 66 | if not ok then |
| 67 | return nil, tostring(err), errcode | 67 | return nil, tostring(err), errcode |
| 68 | end | 68 | end |
| 69 | return result, globals | 69 | return result, globals |
| 70 | end | 70 | end |
diff --git a/src/luarocks/upload/api.lua b/src/luarocks/upload/api.lua index e6762d76..3074965b 100644 --- a/src/luarocks/upload/api.lua +++ b/src/luarocks/upload/api.lua | |||
| @@ -24,7 +24,7 @@ local dir = require("luarocks.dir") | |||
| 24 | local util = require("luarocks.util") | 24 | local util = require("luarocks.util") |
| 25 | local persist = require("luarocks.persist") | 25 | local persist = require("luarocks.persist") |
| 26 | local multipart = require("luarocks.upload.multipart") | 26 | local multipart = require("luarocks.upload.multipart") |
| 27 | local json = require("luarocks.vendor.dkjson") | 27 | local json = require("dkjson") |
| 28 | local dir_sep = package.config:sub(1, 1) | 28 | local dir_sep = package.config:sub(1, 1) |
| 29 | 29 | ||
| 30 | 30 | ||
diff --git a/src/luarocks/upload/api.tl b/src/luarocks/upload/api.tl index dc0b568c..e89ecf6e 100644 --- a/src/luarocks/upload/api.tl +++ b/src/luarocks/upload/api.tl | |||
| @@ -24,7 +24,7 @@ local dir = require("luarocks.dir") | |||
| 24 | local util = require("luarocks.util") | 24 | local util = require("luarocks.util") |
| 25 | local persist = require("luarocks.persist") | 25 | local persist = require("luarocks.persist") |
| 26 | local multipart = require("luarocks.upload.multipart") | 26 | local multipart = require("luarocks.upload.multipart") |
| 27 | local json = require("luarocks.vendor.dkjson") | 27 | local json = require("dkjson") |
| 28 | local dir_sep = package.config:sub(1, 1) | 28 | local dir_sep = package.config:sub(1, 1) |
| 29 | 29 | ||
| 30 | local type Parameters = multipart.Parameters | 30 | local type Parameters = multipart.Parameters |
diff --git a/src/luarocks/util.tl b/src/luarocks/util.tl index f2fb5a5a..6411c9b9 100644 --- a/src/luarocks/util.tl +++ b/src/luarocks/util.tl | |||
| @@ -48,7 +48,7 @@ util.starts_with = core.starts_with | |||
| 48 | local type Fn = util.Fn | 48 | local type Fn = util.Fn |
| 49 | local type Rockspec = require("luarocks.core.types.rockspec").Rockspec | 49 | local type Rockspec = require("luarocks.core.types.rockspec").Rockspec |
| 50 | 50 | ||
| 51 | local type Parser = require("luarocks.vendor.argparse").Parser | 51 | local type Parser = require("argparse").Parser |
| 52 | 52 | ||
| 53 | 53 | ||
| 54 | local scheduled_functions: {Fn} = {} | 54 | local scheduled_functions: {Fn} = {} |
diff --git a/src/luarocks/vendor/argparse.d.tl b/vendor/argparse.d.tl index 812786c4..812786c4 100644 --- a/src/luarocks/vendor/argparse.d.tl +++ b/vendor/argparse.d.tl | |||
diff --git a/src/luarocks/vendor/argparse.lua b/vendor/argparse.lua index 2c2585dd..2c2585dd 100644 --- a/src/luarocks/vendor/argparse.lua +++ b/vendor/argparse.lua | |||
diff --git a/src/compat53/file_mt.lua b/vendor/compat53/file_mt.lua index 6433619d..6433619d 100644 --- a/src/compat53/file_mt.lua +++ b/vendor/compat53/file_mt.lua | |||
diff --git a/src/compat53/init.lua b/vendor/compat53/init.lua index b5075713..b5075713 100644 --- a/src/compat53/init.lua +++ b/vendor/compat53/init.lua | |||
diff --git a/src/compat53/module.lua b/vendor/compat53/module.lua index b580e536..b580e536 100644 --- a/src/compat53/module.lua +++ b/vendor/compat53/module.lua | |||
diff --git a/src/luarocks/vendor/dkjson.d.tl b/vendor/dkjson.d.tl index 4245e8aa..4245e8aa 100644 --- a/src/luarocks/vendor/dkjson.d.tl +++ b/vendor/dkjson.d.tl | |||
diff --git a/src/luarocks/vendor/dkjson.lua b/vendor/dkjson.lua index 7a867241..7a867241 100644 --- a/src/luarocks/vendor/dkjson.lua +++ b/vendor/dkjson.lua | |||
