use julia_version kwarg rather than ctx

Author: IanButterworth

src/Prefix.jl

@@ -597,7 +597,8 @@ function get_addable_spec(name::AbstractString, version::VersionNumber;
         uuid=uuid,
         #version=version,
         tree_hash=tree_hash_sha1,
-        repo=Pkg.Types.GitRepo(rev=git_commit_sha, source=valid_url),
+        rev=git_commit_sha,
+        url=valid_url,
     )
 end
 
@@ -669,18 +670,16 @@ function setup_dependencies(prefix::Prefix,
     deps_project = joinpath(prefix, triplet(platform), ".project")
     Pkg.activate(deps_project) do
         # Update registry first, in case the jll packages we're looking for have just been registered/updated
-        ctx = Pkg.Types.Context(;julia_version)
         outs = verbose ? stdout : devnull
         update_registry(outs)
 
-        # Add all dependencies.  Note: Pkg.add(ctx, deps) modifies in-place `deps` without
-        # notice.  We need to `deepcopy` the argument to prevent it from modying our
-        # dependencies from under our feet: <https://github.com/JuliaLang/Pkg.jl/issues/3112>.
-        Pkg_add(ctx, deepcopy(dependencies); platform=platform, io=outs)
+        # Add all dependencies.
+        Pkg_add(dependencies; platform=platform, io=outs, julia_version=julia_version)
 
         # Ony Julia v1.6, `Pkg.add()` doesn't mutate `dependencies`, so we can't use the `UUID`
         # that was found during resolution there.  Instead, we'll make use of `ctx.env` to figure
         # out the UUIDs of all our packages.
+        ctx = Pkg.Types.Context()
         dependency_uuids = Set([uuid for (uuid, pkg) in ctx.env.manifest if pkg.name ∈ dependencies_names])
 
         # Some JLLs are also standard libraries that may be present in the manifest because
@@ -715,10 +714,10 @@ function setup_dependencies(prefix::Prefix,
                 push!(stdlib_pkgspecs, get_addable_spec(dep.name, dep.version; verbose))
             end
         end
-
         # Re-install stdlib dependencies, but this time with `julia_version = nothing`
         if !isempty(stdlib_pkgspecs)
-            Pkg_add(ctx, stdlib_pkgspecs; io=outs, julia_version=nothing)
+            # TODO: shouldn't this take platform?
+            Pkg_add(stdlib_pkgspecs; io=outs, julia_version=nothing)
         end
 
         # Load their Artifacts.toml files

test/dependencies.jl

@@ -165,10 +165,8 @@ end
                 uuid="86de99a1-58d6-5da7-8064-bd56ce2e322c",
                 tree_hash=Base.SHA1("83481d62501cf2ef22bed745dbcedc4e75fa6e95"),
                 version=PKG_VERSIONS.VersionSpec("*"),
-                repo=Pkg.Types.GitRepo(
-                    source="https://github.com/JuliaBinaryWrappers/LLVM_jll.jl.git",
-                    rev="2772761b330d51146ace3125b26acdad0df4f30f",
-                ),
+                url="https://github.com/JuliaBinaryWrappers/LLVM_jll.jl.git",
+                rev="2772761b330d51146ace3125b26acdad0df4f30f",
             )
 
         with_temp_project() do dir