Skip to content

Conversation

IanButterworth
Copy link
Member

@IanButterworth IanButterworth commented Feb 16, 2025

@IanButterworth
Copy link
Member Author

@giordano this is good from my perspective now

@giordano
Copy link
Member

Haven't looked at the code yet, but this is promising, thanks! I guess a big test is to use this PR in JuliaPackaging/Yggdrasil#10524 (I probably won't have much time this week though).

Comment on lines -665 to 674
function filter_redundant_version(p::PkgSpec)
if p.version !== nothing && p.tree_hash !== nothing
if p.version != PKG_VERSIONS.VersionSpec("*") && p.tree_hash !== nothing
return Pkg.Types.PackageSpec(;name=p.name, tree_hash=p.tree_hash, repo=p.repo)
end
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was wrong, it's not nothing when unset.

julia> pspec = Pkg.PackageSpec(
           name = "LLVM_full_jll",
           uuid = Base.UUID("a3ccf953-465e-511d-b87f-60a6490c289d"),
           tree_hash = Pkg.Types.SHA1("14aa3ea8eb237d341af4f4571d91d17453d88d41"),
           url = "https://github.com/JuliaBinaryWrappers/LLVM_full_jll.jl.git",
           rev = "b0a36286a6a0e6f70324ceec1958a2bb494acdb4"
       )
PackageSpec(
  name = LLVM_full_jll
  uuid = a3ccf953-465e-511d-b87f-60a6490c289d
  tree_hash = 14aa3ea8eb237d341af4f4571d91d17453d88d41
  url = https://github.com/JuliaBinaryWrappers/LLVM_full_jll.jl.git
  rev = b0a36286a6a0e6f70324ceec1958a2bb494acdb4
  version = *
)

julia> pspec.version
VersionSpec("*")

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added a regression test mentioning BBB in Pkg JuliaLang/Pkg.jl#4332

@IanButterworth
Copy link
Member Author

This is ready to go from my perspective

Copy link
Member

@giordano giordano left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks overall great, but the zstd path seems wrong.

src/Prefix.jl Outdated
Comment on lines 367 to 368
# Zstd_jll became a stdlib in Julia v1.13.0 and the path variable changed name
zpath = isdefined(Zstd_jll, :libzstd_path) ? Zstd_jll.libzstd_path : Zstd_jll.zstd_path
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sigh. But also, this doesn't look right: the library and the executable are in two different directories.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For others following along: JuliaLang/julia#59198
Just need to wait for nightly to be 1a1270d977ba8aab7fcefe0d652f493bcc3dc44e

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

@giordano giordano merged commit 19396c7 into master Aug 4, 2025
18 of 19 checks passed
@giordano giordano deleted the ib/no_ctx branch August 4, 2025 08:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants