From b417ab15199258a34dae57b1a702a0da39e7f236 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Sat, 5 Apr 2025 16:45:45 +0800 Subject: [PATCH] gitoxide: fix cargo dependencies --- .../gi/gitoxide/fix-cargo-dependencies.patch | 24 +++++++++++++++++++ pkgs/by-name/gi/gitoxide/package.nix | 4 ++++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/by-name/gi/gitoxide/fix-cargo-dependencies.patch diff --git a/pkgs/by-name/gi/gitoxide/fix-cargo-dependencies.patch b/pkgs/by-name/gi/gitoxide/fix-cargo-dependencies.patch new file mode 100644 index 000000000000..ea9f7f54a7d2 --- /dev/null +++ b/pkgs/by-name/gi/gitoxide/fix-cargo-dependencies.patch @@ -0,0 +1,24 @@ +diff -ur a/gix-packetline/Cargo.toml b/gix-packetline/Cargo.toml +--- a/gix-packetline/Cargo.toml ++++ b/gix-packetline/Cargo.toml +@@ -24,7 +24,7 @@ + ## If set, all IO will become blocking. The same types will be used preventing side-by-side usage of blocking and non-blocking IO. + blocking-io = [] + ## Implement IO traits from `futures-io`. +-async-io = ["dep:futures-io", "dep:futures-lite", "dep:pin-project-lite"] ++async-io = ["dep:futures-io", "futures-lite", "dep:pin-project-lite"] + + #! ### Other + ## Data structures implement `serde::Serialize` and `serde::Deserialize`. +diff -ur a/gix-protocol/Cargo.toml b/gix-protocol/Cargo.toml +--- a/gix-protocol/Cargo.toml ++++ b/gix-protocol/Cargo.toml +@@ -34,7 +34,7 @@ + "gix-transport/async-client", + "dep:async-trait", + "dep:futures-io", +- "dep:futures-lite", ++ "futures-lite", + "handshake", + "fetch" + ] diff --git a/pkgs/by-name/gi/gitoxide/package.nix b/pkgs/by-name/gi/gitoxide/package.nix index 9a86fa275b9b..2f2d6c546f88 100644 --- a/pkgs/by-name/gi/gitoxide/package.nix +++ b/pkgs/by-name/gi/gitoxide/package.nix @@ -30,6 +30,10 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-q35MQGN/tvsK7gg0a/ljoVY6wedy7rwKlSakONgBIgk="; + patches = [ + ./fix-cargo-dependencies.patch + ]; + nativeBuildInputs = [ cmake pkg-config