1 files changed, 6 insertions, 12 deletions

diff --git a/src/luarocks/deps.lua b/src/luarocks/deps.lua
index 0c6bb8d5..34ef8298 100644
--- a/src/luarocks/deps.lua
+++ b/src/luarocks/deps.lua
@@ -323,9 +323,10 @@ end
 local function match_dep(dep, blacklist, deps_mode)
    assert(type(dep) == "table")
 
-   local versions
-   if dep.name == "lua" then
-      versions = { cfg.lua_version }
+   local versions = cfg.rocks_provided[dep.name]
+   if not cfg.rocks_provided[dep.name] then
+      -- provided rocks have higher priority than manifest's rocks
+      versions = { cfg.rocks_provided[dep.name] }
    else
       versions = manif_core.get_versions(dep.name, deps_mode)
    end
@@ -360,11 +361,6 @@ local function match_dep(dep, blacklist, deps_mode)
    end
 end
 
-local whitelist = {}
-if cfg.lua_version == "5.2" then
-   whitelist["bit32"] = true
-end
-
 --- Attempt to match dependencies of a rockspec to installed rocks.
 -- @param rockspec table: The rockspec loaded as a table.
 -- @param blacklist table or nil: Program versions to not use as valid matches.
@@ -382,12 +378,10 @@ function match_deps(rockspec, blacklist, deps_mode)
    local matched, missing, no_upgrade = {}, {}, {}
    
    for _, dep in ipairs(rockspec.dependencies) do
-      if not whitelist[dep.name] then
+      if not cfg.rocks_provided[dep.name] then
          local found = match_dep(dep, blacklist and blacklist[dep.name] or nil, deps_mode)
          if found then
-            if dep.name ~= "lua" then 
-               matched[dep] = found
-            end
+            matched[dep] = found
          else
             if dep.constraints[1] and dep.constraints[1].no_upgrade then
                no_upgrade[dep.name] = dep