diff options
| author | Isaac A. <[email protected]> | 2025-11-04 13:26:23 -0600 |
|---|---|---|
| committer | GitHub <[email protected]> | 2025-11-04 13:26:23 -0600 |
| commit | 8c1e5a599ee5404eb9da40c30f90d2773b1c163f (patch) | |
| tree | d4b28a33c05730d40704a91caa5099ba68c31b8a | |
| parent | c5d08dcde1187fbf3903d51d63af8e15e28650c1 (diff) | |
Fix Nimble find_package to use latest package list format
| -rw-r--r-- | xmake/modules/package/manager/nimble/find_package.lua | 35 |
1 files changed, 23 insertions, 12 deletions
diff --git a/xmake/modules/package/manager/nimble/find_package.lua b/xmake/modules/package/manager/nimble/find_package.lua index 8b9541082..5ce16f287 100644 --- a/xmake/modules/package/manager/nimble/find_package.lua +++ b/xmake/modules/package/manager/nimble/find_package.lua @@ -29,20 +29,29 @@ import("lib.detect.find_file") -- parse package name and version -- -- e.g. --- zip [0.3.1] --- zip [(version: 0.3.1, checksum: 747aab3c43ecb7b50671cdd0ec3b2edc2c83494c)] +-- bearssl +-- └── @0.2.5 (550e6f9321b85de53bba9c0ffab9c95ffbe12ab3) (C:\Users\V\.nimble\pkgs2\bearssl-0.2.5-550e6f9321b85de53bba9c0ffab9c95ffbe12ab3) +-- imguin +-- ├── @1.92.3.0 (9b1400a393d47e0b7a7301115abd04b11a735b06) (C:\Users\V\.nimble\pkgs2\imguin-1.92.3.0-9b1400a393d47e0b7a7301115abd04b11a735b06) +-- └── @1.92.4.0 (fe2a7f25cfc17144dfb4f34c80655827bbe80fcb) (C:\Users\V\.nimble\pkgs2\imguin-1.92.4.0-fe2a7f25cfc17144dfb4f34c80655827bbe80fcb) -- function _parse_packageinfo(line) - local splitinfo = line:split("%s+", {limit = 2}) - local package_name = splitinfo[1] - local version_str = splitinfo[2] + -- match package name (top-level entries only, not indented) + local package_name = line:match("^(%S+)$") + if package_name then + return package_name, nil + end + + -- match version lines like: └── @1.92.4.0 (...) or ├── @0.2.5 (...) + local version_str = line:match("^[├└].-@([%d%.]+)") if version_str then local version = semver.match(version_str) if version then - package_version = version:rawstr() + return nil, version:rawstr() end end - return package_name, package_version + + return nil, nil end -- find package using the nimble package manager @@ -51,7 +60,6 @@ end -- @param opt the options, e.g. {verbose = true, require_version = "1.12.x") -- function main(name, opt) - -- find nimble local nimble = find_tool("nimble") if not nimble then @@ -60,13 +68,16 @@ function main(name, opt) -- find it from all installed package list local result - local list = os.iorunv(nimble.program, {"list", "-i"}) - for _, line in ipairs(list:split("\n", {plain = true})) do + local current_package + local list = os.iorunv(nimble.program, { "list", "-i", "--ver" }) + for _, line in ipairs(list:split("\n", { plain = true })) do local package_name, package_version = _parse_packageinfo(line) - if package_name == name then + if package_name then + current_package = package_name + elseif package_version and current_package == name then if opt.require_version then if package_version and (opt.require_version == "latest" or semver.satisfies(package_version, opt.require_version)) then - result = {version = package_version} + result = { version = package_version } break end else |