From 966be26f26cca422ae034930bb798fe0fbcdd6d0 Mon Sep 17 00:00:00 2001
From: JamesWrigley <james@puiterwijk.org>
Date: Fri, 19 Jul 2024 20:37:31 +0200
Subject: [PATCH] Add compat with HistoricalStdlibVersions v2

This fixes support for nightly with the new Pkg version:
https://github.com/JuliaLang/Pkg.jl/pull/3911.
---
 Project.toml             | 2 +-
 src/BinaryBuilderBase.jl | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Project.toml b/Project.toml
index 2d6c060c..efe3ae93 100644
--- a/Project.toml
+++ b/Project.toml
@@ -41,7 +41,7 @@ Bzip2_jll = "1.0.8"
 CodecZlib = "0.5, 0.6, 0.7"
 Downloads = "1.5"
 Gzip_jll = "1.12.0"
-HistoricalStdlibVersions = "0.1, 1"
+HistoricalStdlibVersions = "2"
 InteractiveUtils = "1.7"
 JLLWrappers = "1.4"
 JSON = "0.21"
diff --git a/src/BinaryBuilderBase.jl b/src/BinaryBuilderBase.jl
index 956694f5..e8f91a07 100644
--- a/src/BinaryBuilderBase.jl
+++ b/src/BinaryBuilderBase.jl
@@ -4,7 +4,7 @@ using Pkg, Pkg.Artifacts, Random, Libdl, InteractiveUtils
 using Base.BinaryPlatforms
 using Downloads
 using JSON, OutputCollectors, Scratch
-using HistoricalStdlibVersions
+import HistoricalStdlibVersions
 
 # Re-export useful stuff from Base.BinaryPlatforms:
 export HostPlatform, platform_dlext, valid_dl_path, arch, libc,
@@ -222,8 +222,8 @@ function __init__()
         use_ccache[] = true
     end
 
-    # Populate `Pkg.Types.STDLIBS_BY_VERSION`
-    append!(empty!(Pkg.Types.STDLIBS_BY_VERSION), HistoricalStdlibVersions.STDLIBS_BY_VERSION)
+    # Populate `Pkg.Types.STDLIBS_BY_VERSION`.
+    HistoricalStdlibVersions.register!()
 end