From 90b6497d068e21bb7c48533a02196c4d9f23c1dc Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Fri, 29 Dec 2023 00:54:27 +0100 Subject: [PATCH] cargo: update to 1.75.0 --- srcpkgs/cargo/patches/downgrade-git2.patch | 32 +++++++++++----------- srcpkgs/cargo/template | 6 ++-- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/srcpkgs/cargo/patches/downgrade-git2.patch b/srcpkgs/cargo/patches/downgrade-git2.patch index ace10e77029..89002151bf3 100644 --- a/srcpkgs/cargo/patches/downgrade-git2.patch +++ b/srcpkgs/cargo/patches/downgrade-git2.patch @@ -1,23 +1,23 @@ diff --git a/Cargo.lock b/Cargo.lock -index cc0cb9a..f6de424 100644 +index a2d339b..6cdf579 100644 --- a/Cargo.lock +++ b/Cargo.lock -@@ -1006,11 +1006,11 @@ dependencies = [ +@@ -995,11 +995,11 @@ dependencies = [ [[package]] name = "git2" --version = "0.18.0" +-version = "0.18.1" +version = "0.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "12ef350ba88a33b4d524b1d1c79096c9ade5ef8c59395df0e60d1e1889414c0e" +-checksum = "fbf97ba92db08df386e10c8ede66a2a0369bd277090afd8710e19e38de9ec0cd" +checksum = "7b989d6a7ca95a362cf2cfc5ad688b3a467be1f87e480b8dad07fee8c79b0044" dependencies = [ -- "bitflags 2.3.3", +- "bitflags 2.4.0", + "bitflags 1.3.2", "libc", "libgit2-sys", "log", -@@ -1021,9 +1021,9 @@ dependencies = [ +@@ -1010,9 +1010,9 @@ dependencies = [ [[package]] name = "git2-curl" @@ -29,7 +29,7 @@ index cc0cb9a..f6de424 100644 dependencies = [ "curl", "git2", -@@ -2003,9 +2003,9 @@ checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" +@@ -2021,9 +2021,9 @@ checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" [[package]] name = "libgit2-sys" @@ -42,26 +42,26 @@ index cc0cb9a..f6de424 100644 "cc", "libc", diff --git a/Cargo.toml b/Cargo.toml -index 4403044..1d50590 100644 +index 3fb36b4..ed19d0d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -40,8 +40,8 @@ curl = "0.4.44" curl-sys = "0.4.68" filetime = "0.2.22" - flate2 = { version = "1.0.27", default-features = false, features = ["zlib"] } --git2 = "0.18.0" + 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.54.1", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "revision"] } + gix = { version = "0.55.2", 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.10.0" - jobserver = "0.1.26" +@@ -58,7 +58,7 @@ itertools = "0.11.0" + jobserver = "0.1.27" lazycell = "1.3.0" - libc = "0.2.148" + libc = "0.2.149" -libgit2-sys = "0.16.1" +libgit2-sys = "0.15.2" - libloading = "0.8.0" - memchr = "2.6.2" + libloading = "0.8.1" + memchr = "2.6.4" miow = "0.6.0" diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template index 208c18818d5..99195fe824e 100644 --- a/srcpkgs/cargo/template +++ b/srcpkgs/cargo/template @@ -1,8 +1,8 @@ # Template file for 'cargo' pkgname=cargo -version=1.74.0 +version=1.75.0 revision=1 -_cargo_revision=0.75.0 +_cargo_revision=0.76.0 build_helper=rust hostmakedepends="cargo-bootstrap rust python3 curl pkg-config zlib-devel" makedepends="rust libcurl-devel openssl-devel" @@ -12,7 +12,7 @@ maintainer="Enno Boland " license="MIT, Apache-2.0" homepage="https://crates.io/" distfiles="https://github.com/rust-lang/cargo/archive/refs/tags/${_cargo_revision}.tar.gz" -checksum=d6b9512bca4b4d692a242188bfe83e1b696c44903007b7b48a56b287d01c063b +checksum=52d57889715cdfe0070b13f6d4dbfc4affdafc763483269e78b6ebd7166fdb83 replaces="cargo-tree>=0" build_options="static bindist"