From 22469a5fd688c8ca9da26061d6306c3cf2cf74a5 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Sat, 5 Apr 2025 16:01:58 +0800
Subject: [PATCH 1/3] gitoxide: update github organization

---
 pkgs/by-name/gi/gitoxide/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gi/gitoxide/package.nix b/pkgs/by-name/gi/gitoxide/package.nix
index dda082b3a278..f04592288a1e 100644
--- a/pkgs/by-name/gi/gitoxide/package.nix
+++ b/pkgs/by-name/gi/gitoxide/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
   version = "0.39.0";
 
   src = fetchFromGitHub {
-    owner = "Byron";
+    owner = "GitoxideLabs";
     repo = "gitoxide";
     rev = "v${version}";
     hash = "sha256-xv4xGkrArJ/LTVLs2SYhvxhfNG6sjVm5nZWsi4s34iM=";
@@ -55,8 +55,8 @@ rustPlatform.buildRustPackage rec {
 
   meta = with lib; {
     description = "Command-line application for interacting with git repositories";
-    homepage = "https://github.com/Byron/gitoxide";
-    changelog = "https://github.com/Byron/gitoxide/blob/v${version}/CHANGELOG.md";
+    homepage = "https://github.com/GitoxideLabs/gitoxide";
+    changelog = "https://github.com/GitoxideLabs/gitoxide/blob/v${version}/CHANGELOG.md";
     license = with licenses; [
       mit # or
       asl20

From 0daef72f28885be4f8a2257e17452d6769a2f3aa Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Sat, 5 Apr 2025 16:02:44 +0800
Subject: [PATCH 2/3] gitoxide: 0.39.0 -> 0.42.0

---
 pkgs/by-name/gi/gitoxide/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gi/gitoxide/package.nix b/pkgs/by-name/gi/gitoxide/package.nix
index f04592288a1e..9a86fa275b9b 100644
--- a/pkgs/by-name/gi/gitoxide/package.nix
+++ b/pkgs/by-name/gi/gitoxide/package.nix
@@ -18,17 +18,17 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "gitoxide";
-  version = "0.39.0";
+  version = "0.42.0";
 
   src = fetchFromGitHub {
     owner = "GitoxideLabs";
     repo = "gitoxide";
     rev = "v${version}";
-    hash = "sha256-xv4xGkrArJ/LTVLs2SYhvxhfNG6sjVm5nZWsi4s34iM=";
+    hash = "sha256-hrCWt4cCnlH3NKH5Uugf/rvVN+YpbeZgZ/lhnQGZ2I0=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-SRJkI61Z8revRWoschkUAJwcJfKB/U03+YfwEcnEIm8=";
+  cargoHash = "sha256-q35MQGN/tvsK7gg0a/ljoVY6wedy7rwKlSakONgBIgk=";
 
   nativeBuildInputs = [
     cmake

From b417ab15199258a34dae57b1a702a0da39e7f236 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Sat, 5 Apr 2025 16:45:45 +0800
Subject: [PATCH 3/3] 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