nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-21 22:43:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

julia.withPackages: pass extra args to update_package_add for julia 1.11+

Browse Source
This commit is contained in:
thomasjm 2024-10-15 16:07:22 -07:00 committed by Nick Cao
parent c61ac9e1ea
commit d51280ffba
No known key found for this signature in database
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/julia-modules/resolve_packages.jl
View File

@ -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)