diff --git a/srcpkgs/cargo/patches/downgrade-git2.patch b/srcpkgs/cargo/patches/downgrade-git2.patch deleted file mode 100644 index c35a90d0ce5..00000000000 --- a/srcpkgs/cargo/patches/downgrade-git2.patch +++ /dev/null @@ -1,67 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index 36cf880..72aca65 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -1025,11 +1025,11 @@ dependencies = [ - - [[package]] - name = "git2" --version = "0.18.1" -+version = "0.17.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "fbf97ba92db08df386e10c8ede66a2a0369bd277090afd8710e19e38de9ec0cd" -+checksum = "7b989d6a7ca95a362cf2cfc5ad688b3a467be1f87e480b8dad07fee8c79b0044" - dependencies = [ -- "bitflags 2.4.1", -+ "bitflags 1.3.2", - "libc", - "libgit2-sys", - "log", -@@ -1040,9 +1040,9 @@ dependencies = [ - - [[package]] - name = "git2-curl" --version = "0.19.0" -+version = "0.18.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "78e26b61608c573ffd26fc79061a823aa5147449a1afe1f61679a21e2031f7c3" -+checksum = "f8f8b7432b72928cff76f69e59ed5327f94a52763731e71274960dee72fe5f8c" - dependencies = [ - "curl", - "git2", -@@ -2065,9 +2065,9 @@ checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" - - [[package]] - name = "libgit2-sys" --version = "0.16.1+1.7.1" -+version = "0.15.2+1.6.4" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "f2a2bb3680b094add03bb3732ec520ece34da31a8cd2d633d1389d0f0fb60d0c" -+checksum = "a80df2e11fb4a61f4ba2ab42dbe7f74468da143f1a75c74e11dee7c813f694fa" - dependencies = [ - "cc", - "libc", -diff --git a/Cargo.toml b/Cargo.toml -index c07b004..68c45a0 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -40,8 +40,8 @@ curl = "0.4.44" - curl-sys = "0.4.70" - filetime = "0.2.22" - flate2 = { version = "1.0.28", default-features = false, features = ["zlib"] } --git2 = "0.18.1" --git2-curl = "0.19.0" -+git2 = "0.17.2" -+git2-curl = "0.18.0" - gix = { version = "0.56.0", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "revision"] } - gix-features-for-configuration-only = { version = "0.35.0", package = "gix-features", features = [ "parallel" ] } - glob = "0.3.1" -@@ -58,7 +58,7 @@ itertools = "0.12.0" - jobserver = "0.1.27" - lazycell = "1.3.0" - libc = "0.2.150" --libgit2-sys = "0.16.1" -+libgit2-sys = "0.15.2" - libloading = "0.8.1" - memchr = "2.6.4" - miow = "0.6.0" diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template index 4ca4a399560..71c35f0f1cc 100644 --- a/srcpkgs/cargo/template +++ b/srcpkgs/cargo/template @@ -1,7 +1,7 @@ # Template file for 'cargo' pkgname=cargo version=1.76.0 -revision=1 +revision=2 _cargo_revision=0.77.0 build_helper=rust hostmakedepends="cargo-bootstrap rust python3 curl pkg-config zlib-devel"