aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortobil4sk <tobil4sk@outlook.com>2026-02-03 22:47:50 +0000
committerGitHub <noreply@github.com>2026-02-03 19:47:50 -0300
commit47301d83aba58925e1b9594023621ebb27070cdb (patch)
tree73021b5366687ec1683b9e66505e74f22f71d31b /src
parentacf1f47e7f1b1ecbc147e41cae51ddfd06ad898d (diff)
downloadluarocks-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 '')
-rw-r--r--src/luarocks/admin/cmd/add.tl2
-rw-r--r--src/luarocks/admin/cmd/make_manifest.tl2
-rw-r--r--src/luarocks/admin/cmd/refresh_cache.tl2
-rw-r--r--src/luarocks/admin/cmd/remove.tl2
-rw-r--r--src/luarocks/cmd.lua2
-rw-r--r--src/luarocks/cmd.tl2
-rw-r--r--src/luarocks/cmd/build.tl2
-rw-r--r--src/luarocks/cmd/config.lua2
-rw-r--r--src/luarocks/cmd/config.tl4
-rw-r--r--src/luarocks/cmd/doc.tl2
-rw-r--r--src/luarocks/cmd/download.tl2
-rw-r--r--src/luarocks/cmd/init.tl2
-rw-r--r--src/luarocks/cmd/install.tl2
-rw-r--r--src/luarocks/cmd/lint.tl2
-rw-r--r--src/luarocks/cmd/list.tl2
-rw-r--r--src/luarocks/cmd/make.tl2
-rw-r--r--src/luarocks/cmd/new_version.tl2
-rw-r--r--src/luarocks/cmd/pack.tl2
-rw-r--r--src/luarocks/cmd/path.tl2
-rw-r--r--src/luarocks/cmd/purge.tl2
-rw-r--r--src/luarocks/cmd/remove.tl2
-rw-r--r--src/luarocks/cmd/search.tl2
-rw-r--r--src/luarocks/cmd/show.tl2
-rw-r--r--src/luarocks/cmd/test.tl2
-rw-r--r--src/luarocks/cmd/unpack.tl2
-rw-r--r--src/luarocks/cmd/upload.tl2
-rw-r--r--src/luarocks/cmd/which.tl2
-rw-r--r--src/luarocks/cmd/write_rockspec.tl2
-rw-r--r--src/luarocks/core/persist.lua2
-rw-r--r--src/luarocks/core/persist.tl4
-rw-r--r--src/luarocks/upload/api.lua2
-rw-r--r--src/luarocks/upload/api.tl2
-rw-r--r--src/luarocks/util.tl2
-rw-r--r--vendor/argparse.d.tl (renamed from src/luarocks/vendor/argparse.d.tl)0
-rw-r--r--vendor/argparse.lua (renamed from src/luarocks/vendor/argparse.lua)0
-rw-r--r--vendor/compat53/file_mt.lua (renamed from src/compat53/file_mt.lua)0
-rw-r--r--vendor/compat53/init.lua (renamed from src/compat53/init.lua)0
-rw-r--r--vendor/compat53/module.lua (renamed from src/compat53/module.lua)0
-rw-r--r--vendor/dkjson.d.tl (renamed from src/luarocks/vendor/dkjson.d.tl)0
-rw-r--r--vendor/dkjson.lua (renamed from src/luarocks/vendor/dkjson.lua)0
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")
12local cache = require("luarocks.admin.cache") 12local cache = require("luarocks.admin.cache")
13local index = require("luarocks.admin.index") 13local index = require("luarocks.admin.index")
14 14
15local type Parser = require("luarocks.vendor.argparse").Parser 15local type Parser = require("argparse").Parser
16 16
17local type Args = require("luarocks.core.types.args").Args 17local 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")
12local fs = require("luarocks.fs") 12local fs = require("luarocks.fs")
13local dir = require("luarocks.dir") 13local dir = require("luarocks.dir")
14 14
15local type Parser = require("luarocks.vendor.argparse").Parser 15local type Parser = require("argparse").Parser
16 16
17local type Args = require("luarocks.core.types.args").Args 17local 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")
7local util = require("luarocks.util") 7local util = require("luarocks.util")
8local cache = require("luarocks.admin.cache") 8local cache = require("luarocks.admin.cache")
9 9
10local type Parser = require("luarocks.vendor.argparse").Parser 10local type Parser = require("argparse").Parser
11 11
12local type Args = require("luarocks.core.types.args").Args 12local 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")
12local cache = require("luarocks.admin.cache") 12local cache = require("luarocks.admin.cache")
13local index = require("luarocks.admin.index") 13local index = require("luarocks.admin.index")
14 14
15local type Parser = require("luarocks.vendor.argparse").Parser 15local type Parser = require("argparse").Parser
16 16
17local type Args = require("luarocks.core.types.args").Args 17local 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")
20local dir = require("luarocks.dir") 20local dir = require("luarocks.dir")
21local fun = require("luarocks.fun") 21local fun = require("luarocks.fun")
22local fs = require("luarocks.fs") 22local fs = require("luarocks.fs")
23local argparse = require("luarocks.vendor.argparse") 23local 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")
20local dir = require("luarocks.dir") 20local dir = require("luarocks.dir")
21local fun = require("luarocks.fun") 21local fun = require("luarocks.fun")
22local fs = require("luarocks.fs") 22local fs = require("luarocks.fs")
23local argparse = require("luarocks.vendor.argparse") 23local argparse = require("argparse")
24 24
25local type Tree = require("luarocks.core.types.tree").Tree 25local 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")
19local make = require("luarocks.cmd.make") 19local make = require("luarocks.cmd.make")
20local repos = require("luarocks.repos") 20local repos = require("luarocks.repos")
21 21
22local type Parser = require("luarocks.vendor.argparse").Parser 22local type Parser = require("argparse").Parser
23 23
24local type Args = require("luarocks.core.types.args").Args 24local type Args = require("luarocks.core.types.args").Args
25local type BOpts = require("luarocks.core.types.bopts").BOpts 25local 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")
10local deps = require("luarocks.deps") 10local deps = require("luarocks.deps")
11local dir = require("luarocks.dir") 11local dir = require("luarocks.dir")
12local fs = require("luarocks.fs") 12local fs = require("luarocks.fs")
13local json = require("luarocks.vendor.dkjson") 13local 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")
10local deps = require("luarocks.deps") 10local deps = require("luarocks.deps")
11local dir = require("luarocks.dir") 11local dir = require("luarocks.dir")
12local fs = require("luarocks.fs") 12local fs = require("luarocks.fs")
13local json = require("luarocks.vendor.dkjson") 13local json = require("dkjson")
14 14
15local type Parser = require("luarocks.vendor.argparse").Parser 15local type Parser = require("argparse").Parser
16 16
17local type Args = require("luarocks.core.types.args").Args 17local 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")
13local fs = require("luarocks.fs") 13local fs = require("luarocks.fs")
14local download = require("luarocks.download") 14local download = require("luarocks.download")
15 15
16local type Parser = require("luarocks.vendor.argparse").Parser 16local type Parser = require("argparse").Parser
17 17
18local type Args = require("luarocks.core.types.args").Args 18local type Args = require("luarocks.core.types.args").Args
19local type Rockspec = require("luarocks.core.types.rockspec").Rockspec 19local 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
7local util = require("luarocks.util") 7local util = require("luarocks.util")
8local download = require("luarocks.download") 8local download = require("luarocks.download")
9 9
10local type Parser = require("luarocks.vendor.argparse").Parser 10local type Parser = require("argparse").Parser
11 11
12local type Args = require("luarocks.core.types.args").Args 12local 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")
12local persist = require("luarocks.persist") 12local persist = require("luarocks.persist")
13local write_rockspec = require("luarocks.cmd.write_rockspec") 13local write_rockspec = require("luarocks.cmd.write_rockspec")
14 14
15local type Parser = require("luarocks.vendor.argparse").Parser 15local type Parser = require("argparse").Parser
16 16
17local type Args = require("luarocks.core.types.args").Args 17local 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")
17local queries = require("luarocks.queries") 17local queries = require("luarocks.queries")
18local cfg = require("luarocks.core.cfg") 18local cfg = require("luarocks.core.cfg")
19 19
20local type Parser = require("luarocks.vendor.argparse").Parser 20local type Parser = require("argparse").Parser
21 21
22local type Args = require("luarocks.core.types.args").Args 22local type Args = require("luarocks.core.types.args").Args
23local type IOpts = require("luarocks.core.types.installs").IOpts 23local 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")
8local download = require("luarocks.download") 8local download = require("luarocks.download")
9local fetch = require("luarocks.fetch") 9local fetch = require("luarocks.fetch")
10 10
11local type Parser = require("luarocks.vendor.argparse").Parser 11local type Parser = require("argparse").Parser
12 12
13local type Args = require("luarocks.core.types.args").Args 13local 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
20local type Outdated = list.Outdated 20local type Outdated = list.Outdated
21 21
22local type Parser = require("luarocks.vendor.argparse").Parser 22local type Parser = require("argparse").Parser
23 23
24local type Args = require("luarocks.core.types.args").Args 24local 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")
17local dir = require("luarocks.dir") 17local dir = require("luarocks.dir")
18local fs = require("luarocks.fs") 18local fs = require("luarocks.fs")
19 19
20local type Parser = require("luarocks.vendor.argparse").Parser 20local type Parser = require("argparse").Parser
21 21
22local type Args = require("luarocks.core.types.args").Args 22local 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")
12local dir = require("luarocks.dir") 12local dir = require("luarocks.dir")
13local type_rockspec = require("luarocks.type.rockspec") 13local type_rockspec = require("luarocks.type.rockspec")
14 14
15local type Parser = require("luarocks.vendor.argparse").Parser 15local type Parser = require("argparse").Parser
16 16
17local type Args = require("luarocks.core.types.args").Args 17local 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")
8local pack = require("luarocks.pack") 8local pack = require("luarocks.pack")
9local queries = require("luarocks.queries") 9local queries = require("luarocks.queries")
10 10
11local type Parser = require("luarocks.vendor.argparse").Parser 11local type Parser = require("argparse").Parser
12 12
13local type Args = require("luarocks.core.types.args").Args 13local 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")
8local cfg = require("luarocks.core.cfg") 8local cfg = require("luarocks.core.cfg")
9local fs = require("luarocks.fs") 9local fs = require("luarocks.fs")
10 10
11local type Parser = require("luarocks.vendor.argparse").Parser 11local type Parser = require("argparse").Parser
12 12
13local type Args = require("luarocks.core.types.args").Args 13local 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")
14local remove = require("luarocks.remove") 14local remove = require("luarocks.remove")
15local queries = require("luarocks.queries") 15local queries = require("luarocks.queries")
16 16
17local type Parser = require("luarocks.vendor.argparse").Parser 17local type Parser = require("argparse").Parser
18 18
19local type Args = require("luarocks.core.types.args").Args 19local 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")
13local deps = require("luarocks.deps") 13local deps = require("luarocks.deps")
14local queries = require("luarocks.queries") 14local queries = require("luarocks.queries")
15 15
16local type Parser = require("luarocks.vendor.argparse").Parser 16local type Parser = require("argparse").Parser
17 17
18local type Args = require("luarocks.core.types.args").Args 18local 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")
10local queries = require("luarocks.queries") 10local queries = require("luarocks.queries")
11local results = require("luarocks.results") 11local results = require("luarocks.results")
12 12
13local type Parser = require("luarocks.vendor.argparse").Parser 13local type Parser = require("argparse").Parser
14 14
15local type Args = require("luarocks.core.types.args").Args 15local 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")
22local type Return = show.Return 22local type Return = show.Return
23local type RenderData = {string: string | {string}} 23local type RenderData = {string: string | {string}}
24 24
25local type Parser = require("luarocks.vendor.argparse").Parser 25local type Parser = require("argparse").Parser
26 26
27local type Args = require("luarocks.core.types.args").Args 27local 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
7local util = require("luarocks.util") 7local util = require("luarocks.util")
8local test = require("luarocks.test") 8local test = require("luarocks.test")
9 9
10local type Parser = require("luarocks.vendor.argparse").Parser 10local type Parser = require("argparse").Parser
11 11
12local type Args = require("luarocks.core.types.args").Args 12local 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")
11local dir = require("luarocks.dir") 11local dir = require("luarocks.dir")
12local search = require("luarocks.search") 12local search = require("luarocks.search")
13 13
14local type Parser = require("luarocks.vendor.argparse").Parser 14local type Parser = require("argparse").Parser
15 15
16local type Args = require("luarocks.core.types.args").Args 16local 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
21local type Response = upload.Response 21local type Response = upload.Response
22 22
23local type Parser = require("luarocks.vendor.argparse").Parser 23local type Parser = require("argparse").Parser
24 24
25local type Args = require("luarocks.core.types.args").Args 25local type Args = require("luarocks.core.types.args").Args
26local type Rockspec = require("luarocks.core.types.rockspec").Rockspec 26local 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")
8local cfg = require("luarocks.core.cfg") 8local cfg = require("luarocks.core.cfg")
9local util = require("luarocks.util") 9local util = require("luarocks.util")
10 10
11local type Parser = require("luarocks.vendor.argparse").Parser 11local type Parser = require("argparse").Parser
12 12
13local type Args = require("luarocks.core.types.args").Args 13local 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")
12local type_rockspec = require("luarocks.type.rockspec") 12local type_rockspec = require("luarocks.type.rockspec")
13local util = require("luarocks.util") 13local util = require("luarocks.util")
14 14
15local type Parser = require("luarocks.vendor.argparse").Parser 15local type Parser = require("argparse").Parser
16 16
17local type Args = require("luarocks.core.types.args").Args 17local 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
2local persist = {} 2local persist = {}
3 3
4 4
5local json = require("luarocks.vendor.dkjson") 5local 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 @@
2local record persist 2local record persist
3end 3end
4 4
5local json = require("luarocks.vendor.dkjson") 5local 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
70end 70end
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")
24local util = require("luarocks.util") 24local util = require("luarocks.util")
25local persist = require("luarocks.persist") 25local persist = require("luarocks.persist")
26local multipart = require("luarocks.upload.multipart") 26local multipart = require("luarocks.upload.multipart")
27local json = require("luarocks.vendor.dkjson") 27local json = require("dkjson")
28local dir_sep = package.config:sub(1, 1) 28local 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")
24local util = require("luarocks.util") 24local util = require("luarocks.util")
25local persist = require("luarocks.persist") 25local persist = require("luarocks.persist")
26local multipart = require("luarocks.upload.multipart") 26local multipart = require("luarocks.upload.multipart")
27local json = require("luarocks.vendor.dkjson") 27local json = require("dkjson")
28local dir_sep = package.config:sub(1, 1) 28local dir_sep = package.config:sub(1, 1)
29 29
30local type Parameters = multipart.Parameters 30local 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
48local type Fn = util.Fn 48local type Fn = util.Fn
49local type Rockspec = require("luarocks.core.types.rockspec").Rockspec 49local type Rockspec = require("luarocks.core.types.rockspec").Rockspec
50 50
51local type Parser = require("luarocks.vendor.argparse").Parser 51local type Parser = require("argparse").Parser
52 52
53 53
54local scheduled_functions: {Fn} = {} 54local 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