From d51280ffba060cd9eef1f211ffd4f6dcf35e18f9 Mon Sep 17 00:00:00 2001 From: thomasjm Date: Tue, 15 Oct 2024 16:07:22 -0700 Subject: [PATCH] julia.withPackages: pass extra args to update_package_add for julia 1.11+ --- pkgs/development/julia-modules/resolve_packages.jl | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/julia-modules/resolve_packages.jl b/pkgs/development/julia-modules/resolve_packages.jl index 699f457d25fb..fce60035d5f5 100644 --- a/pkgs/development/julia-modules/resolve_packages.jl +++ b/pkgs/development/julia-modules/resolve_packages.jl @@ -36,7 +36,11 @@ assert_can_add(ctx, pkgs) for (i, pkg) in pairs(pkgs) entry = Pkg.Types.manifest_info(ctx.env.manifest, pkg.uuid) is_dep = any(uuid -> uuid == pkg.uuid, [uuid for (name, uuid) in ctx.env.project.deps]) - pkgs[i] = update_package_add(ctx, pkg, entry, is_dep) + if VERSION >= VersionNumber("1.11") + pkgs[i] = update_package_add(ctx, pkg, entry, nothing, nothing, is_dep) + else + pkgs[i] = update_package_add(ctx, pkg, entry, is_dep) + end end foreach(pkg -> ctx.env.project.deps[pkg.name] = pkg.uuid, pkgs) @@ -83,7 +87,11 @@ if VERSION >= VersionNumber("1.9") push!(orig_pkgs, pkg) ctx.env.project.deps[name] = uuid entry = Pkg.Types.manifest_info(ctx.env.manifest, uuid) - orig_pkgs[length(orig_pkgs)] = update_package_add(ctx, pkg, entry, false) + if VERSION >= VersionNumber("1.11") + orig_pkgs[length(orig_pkgs)] = update_package_add(ctx, pkg, entry, nothing, nothing, false) + else + orig_pkgs[length(orig_pkgs)] = update_package_add(ctx, pkg, entry, false) + end end global pkgs, deps_map = _resolve(ctx.io, ctx.env, ctx.registries, orig_pkgs, PRESERVE_NONE, ctx.julia_version)