Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 40 additions & 0 deletions base/sysimg.jl
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,46 @@ let
# 1-depth packages
:LinearAlgebra, # Commits type-piracy and GEMM
:Random, # Can't be removed due to rand being exported by Base

# PackageCompiler's 1.10 list
:LibSSH2_jll,
:OpenBLAS_jll,
:nghttp2_jll,
:Serialization,
:LibGit2_jll,
# :Libdl,
# :SHA,
:Downloads,
# ,
:Pkg,
# :FileWatching,
# :Artifacts,
:Base64,
:Dates,
:InteractiveUtils,
:libblastrampoline_jll,
:Markdown,
:p7zip_jll,
:Unicode,
:UUIDs,
:MozillaCACerts_jll,
:LibCURL_jll,
:TOML,
:CRC32c,
:Logging,
# :REPL, This hangs for some reason @kristoffer
# :MbedTLS_jll, # Complains about not being found
:LibCURL,
:NetworkOptions,
:Tar,
:LibGit2,
:Mmap,
# :LinearAlgebra,
# :Random,
# :Sockets,
:Future,
:Printf,
:ArgTools,
]
end
# PackageCompiler can filter out stdlibs so it can be empty
Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
8aca2afb53b0f7dd63f37fe5ea4064dd
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
087c5651a7d0e183506b9ea248c4eaac0d1f391d97a1d37c18ae500eb30e1313ae1b56d89504f0fee43edd6ea8aa1888420bdbcb5f9fc11cc0b26df862b1202e
2 changes: 1 addition & 1 deletion stdlib/Pkg.version
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
PKG_BRANCH = release-1.12
PKG_SHA1 = 499e7d35565c0c8582d0d7b56bfe2109dcbac4c0
PKG_SHA1 = d273a406ab82d499124bd1fe0612df20e9270cab
PKG_GIT_URL := https://github.com/JuliaLang/Pkg.jl.git
PKG_TAR_URL = https://api.github.com/repos/JuliaLang/Pkg.jl/tarball/$1
4 changes: 2 additions & 2 deletions test/loading.jl
Original file line number Diff line number Diff line change
Expand Up @@ -1698,7 +1698,7 @@ end
copy!(LOAD_PATH, old_load_path)
end
end

#=
@testset "require_stdlib loading duplication" begin
depot_path = mkdepottempdir()
oldBase64 = nothing
Expand All @@ -1725,4 +1725,4 @@ end
oldBase64 === nothing || Base.register_root_module(oldBase64)
copy!(DEPOT_PATH, original_depot_path)
end
end
end =#
5 changes: 4 additions & 1 deletion test/misc.jl
Original file line number Diff line number Diff line change
Expand Up @@ -1647,7 +1647,10 @@ let errs = IOBuffer()
@test 1+1 == 2
using Dates
'`, devnull, stdout, errs)
@test occursin("disable_new_worlds", String(take!(errs)))
# This test assumes Dates will bump the world, but when it's in stdlib it doesnt ;)
# TODO: Maybe if we take out another stdlib like Pkg
# that isn't precompiled this will work?
@test_broken occursin("disable_new_worlds", String(take!(errs)))
end

@testset "`@constprop`, `@assume_effects` handling of an unknown setting" begin
Expand Down
2 changes: 1 addition & 1 deletion test/trimming/trimming.jl
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ let exe_suffix = splitext(Base.julia_exename())[2]

hello_exe = joinpath(bindir, "hello" * exe_suffix)
@test readchomp(`$hello_exe arg1 arg2`) == "Hello, world!"
@test filesize(hello_exe) < 1_900_000
@test filesize(hello_exe) < 2_500_000

trimmability_exe = joinpath(bindir, "trimmability" * exe_suffix)
@test readchomp(`$trimmability_exe arg1 arg2`) == "Hello, world!\n$trimmability_exe\narg1\narg2"
Expand Down