45 lines
1.6 KiB
Diff
45 lines
1.6 KiB
Diff
diff -up rustc-beta-src/src/tools/cargo/Cargo.lock.orig rustc-beta-src/src/tools/cargo/Cargo.lock
|
|
--- rustc-beta-src/src/tools/cargo/Cargo.lock.orig 2025-06-13 15:47:08.609927319 -0700
|
|
+++ rustc-beta-src/src/tools/cargo/Cargo.lock 2025-06-13 15:47:54.463092386 -0700
|
|
@@ -2530,7 +2530,6 @@ checksum = "e1a117465e7e1597e8febea8bb0c
|
|
dependencies = [
|
|
"cc",
|
|
"libc",
|
|
- "libssh2-sys",
|
|
"libz-sys",
|
|
"openssl-sys",
|
|
"pkg-config",
|
|
@@ -2576,20 +2575,6 @@ dependencies = [
|
|
"pkg-config",
|
|
"vcpkg",
|
|
]
|
|
-
|
|
-[[package]]
|
|
-name = "libssh2-sys"
|
|
-version = "0.3.1"
|
|
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
-checksum = "220e4f05ad4a218192533b300327f5150e809b54c4ec83b5a1d91833601811b9"
|
|
-dependencies = [
|
|
- "cc",
|
|
- "libc",
|
|
- "libz-sys",
|
|
- "openssl-sys",
|
|
- "pkg-config",
|
|
- "vcpkg",
|
|
-]
|
|
|
|
[[package]]
|
|
name = "libz-rs-sys"
|
|
diff -up rustc-beta-src/src/tools/cargo/Cargo.toml.orig rustc-beta-src/src/tools/cargo/Cargo.toml
|
|
--- rustc-beta-src/src/tools/cargo/Cargo.toml.orig 2025-06-13 15:47:08.610402846 -0700
|
|
+++ rustc-beta-src/src/tools/cargo/Cargo.toml 2025-06-13 15:47:51.696071356 -0700
|
|
@@ -46,7 +46,7 @@ curl = "0.4.47"
|
|
curl-sys = "0.4.79"
|
|
filetime = "0.2.25"
|
|
flate2 = { version = "1.1.1", default-features = false, features = ["zlib-rs"] }
|
|
-git2 = "0.20.0"
|
|
+git2 = { version = "0.20.0", default-features = false, features = ["https"] }
|
|
git2-curl = "0.21.0"
|
|
# When updating this, also see if `gix-transport` further down needs updating or some auth-related tests will fail.
|
|
gix = { version = "0.71.0", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "parallel", "dirwalk"] }
|