diff options
| author | Hisham Muhammad <hisham@gobolinux.org> | 2026-04-06 16:34:35 -0300 |
|---|---|---|
| committer | Hisham Muhammad <hisham@gobolinux.org> | 2026-04-06 16:34:35 -0300 |
| commit | fc402072fca856f05e8ae09799cd6c2a2352dd17 (patch) | |
| tree | 8c1e660eabed2d9631cf46f81739eaac147bfa3f /src | |
| parent | 6b0a7f7f8770f5d21730a5f2fa8fcbc695687c43 (diff) | |
| download | luarocks-main.tar.gz luarocks-main.tar.bz2 luarocks-main.zip | |
Do not pin `lua` as a dependency.main
Fixes #1874.
Diffstat (limited to 'src')
| -rw-r--r-- | src/luarocks/deplocks.lua | 11 | ||||
| -rw-r--r-- | src/luarocks/deplocks.tl | 11 |
2 files changed, 22 insertions, 0 deletions
diff --git a/src/luarocks/deplocks.lua b/src/luarocks/deplocks.lua index 6f4e40a6..9b9a66d4 100644 --- a/src/luarocks/deplocks.lua +++ b/src/luarocks/deplocks.lua | |||
| @@ -61,6 +61,12 @@ function deplocks.load(root_rock_name, dirname) | |||
| 61 | 61 | ||
| 62 | 62 | ||
| 63 | depstable = result | 63 | depstable = result |
| 64 | |||
| 65 | |||
| 66 | if depstable.dependencies and depstable.dependencies["lua"] then | ||
| 67 | depstable.dependencies["lua"] = nil | ||
| 68 | end | ||
| 69 | |||
| 64 | return true, filename | 70 | return true, filename |
| 65 | end | 71 | end |
| 66 | 72 | ||
| @@ -69,6 +75,11 @@ function deplocks.add(depskey, name, version) | |||
| 69 | return | 75 | return |
| 70 | end | 76 | end |
| 71 | 77 | ||
| 78 | |||
| 79 | if name == "lua" then | ||
| 80 | return | ||
| 81 | end | ||
| 82 | |||
| 72 | local dk = depstable[depskey] | 83 | local dk = depstable[depskey] |
| 73 | if not dk then | 84 | if not dk then |
| 74 | dk = {} | 85 | dk = {} |
diff --git a/src/luarocks/deplocks.tl b/src/luarocks/deplocks.tl index 2c4889bd..127af92a 100644 --- a/src/luarocks/deplocks.tl +++ b/src/luarocks/deplocks.tl | |||
| @@ -61,6 +61,12 @@ function deplocks.load(root_rock_name: string, dirname: string): boolean, string | |||
| 61 | 61 | ||
| 62 | -- FIXME we're not really checking that the table is a DepsTable | 62 | -- FIXME we're not really checking that the table is a DepsTable |
| 63 | depstable = result as DepsTable | 63 | depstable = result as DepsTable |
| 64 | |||
| 65 | -- Discard any previously pinned version for `lua`. | ||
| 66 | if depstable.dependencies and depstable.dependencies["lua"] then | ||
| 67 | depstable.dependencies["lua"] = nil | ||
| 68 | end | ||
| 69 | |||
| 64 | return true, filename | 70 | return true, filename |
| 65 | end | 71 | end |
| 66 | 72 | ||
| @@ -69,6 +75,11 @@ function deplocks.add(depskey: DepsKey, name: string, version: string) | |||
| 69 | return | 75 | return |
| 70 | end | 76 | end |
| 71 | 77 | ||
| 78 | -- Do not pin `lua`: it is a special pseudo-dependency. | ||
| 79 | if name == "lua" then | ||
| 80 | return | ||
| 81 | end | ||
| 82 | |||
| 72 | local dk = depstable[depskey] | 83 | local dk = depstable[depskey] |
| 73 | if not dk then | 84 | if not dk then |
| 74 | dk = {} | 85 | dk = {} |
