Skip to content

Commit

Permalink
cargo: update to 1.76.0
Browse files Browse the repository at this point in the history
  • Loading branch information
tranzystorekk committed Feb 10, 2024
1 parent 58718a7 commit 4bee4a9
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 13 deletions.
20 changes: 10 additions & 10 deletions srcpkgs/cargo/patches/downgrade-git2.patch
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/Cargo.lock b/Cargo.lock
index a2d339b..6cdf579 100644
index 36cf880..72aca65 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -995,11 +995,11 @@ dependencies = [
@@ -1025,11 +1025,11 @@ dependencies = [

[[package]]
name = "git2"
Expand All @@ -12,12 +12,12 @@ index a2d339b..6cdf579 100644
-checksum = "fbf97ba92db08df386e10c8ede66a2a0369bd277090afd8710e19e38de9ec0cd"
+checksum = "7b989d6a7ca95a362cf2cfc5ad688b3a467be1f87e480b8dad07fee8c79b0044"
dependencies = [
- "bitflags 2.4.0",
- "bitflags 2.4.1",
+ "bitflags 1.3.2",
"libc",
"libgit2-sys",
"log",
@@ -1010,9 +1010,9 @@ dependencies = [
@@ -1040,9 +1040,9 @@ dependencies = [

[[package]]
name = "git2-curl"
Expand All @@ -29,7 +29,7 @@ index a2d339b..6cdf579 100644
dependencies = [
"curl",
"git2",
@@ -2021,9 +2021,9 @@ checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b"
@@ -2065,9 +2065,9 @@ checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c"

[[package]]
name = "libgit2-sys"
Expand All @@ -42,24 +42,24 @@ index a2d339b..6cdf579 100644
"cc",
"libc",
diff --git a/Cargo.toml b/Cargo.toml
index 3fb36b4..ed19d0d 100644
index c07b004..68c45a0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -40,8 +40,8 @@ curl = "0.4.44"
curl-sys = "0.4.68"
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.55.2", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "revision"] }
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.11.0"
@@ -58,7 +58,7 @@ itertools = "0.12.0"
jobserver = "0.1.27"
lazycell = "1.3.0"
libc = "0.2.149"
libc = "0.2.150"
-libgit2-sys = "0.16.1"
+libgit2-sys = "0.15.2"
libloading = "0.8.1"
Expand Down
9 changes: 6 additions & 3 deletions srcpkgs/cargo/template
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Template file for 'cargo'
pkgname=cargo
version=1.75.0
version=1.76.0
revision=1
_cargo_revision=0.76.0
_cargo_revision=0.77.0
build_helper=rust
hostmakedepends="cargo-bootstrap rust python3 curl pkg-config zlib-devel"
makedepends="rust libcurl-devel openssl-devel"
Expand All @@ -12,7 +12,7 @@ maintainer="Enno Boland <[email protected]>"
license="MIT, Apache-2.0"
homepage="https://crates.io/"
distfiles="https://github.com/rust-lang/cargo/archive/refs/tags/${_cargo_revision}.tar.gz"
checksum=52d57889715cdfe0070b13f6d4dbfc4affdafc763483269e78b6ebd7166fdb83
checksum=1c33e2feb197f848f082fdc074162328e231c2f68394e0e1d2dbbbf79c9fc3ec
replaces="cargo-tree>=0"

build_options="static bindist"
Expand All @@ -29,6 +29,9 @@ fi
do_build() {
local cargs

# breaks requested building sqlite in bundled mode
unset LIBSQLITE3_SYS_USE_PKG_CONFIG

if [ -n "$_build_static" ]; then
unset LIBSSH2_SYS_USE_PKG_CONFIG
export OPENSSL_STATIC=1
Expand Down

0 comments on commit 4bee4a9

Please sign in to comment.