From 794f752063e28d8fd9785714857fb44825ce2500 Mon Sep 17 00:00:00 2001
From: Thomas Butter <tbutter@gmail.com>
Date: Sat, 30 May 2026 20:36:00 +0000
Subject: [PATCH] gex: 0.6.4 -> 0.6.7

---
 pkgs/by-name/ge/gex/package.nix         | 10 ++---
 pkgs/by-name/ge/gex/patch-libgit2.patch | 54 -------------------------
 2 files changed, 3 insertions(+), 61 deletions(-)
 delete mode 100644 pkgs/by-name/ge/gex/patch-libgit2.patch

diff --git a/pkgs/by-name/ge/gex/package.nix b/pkgs/by-name/ge/gex/package.nix
index a57d18045ee7..71d950b68b80 100644
--- a/pkgs/by-name/ge/gex/package.nix
+++ b/pkgs/by-name/ge/gex/package.nix
@@ -11,13 +11,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "gex";
-  version = "0.6.4";
+  version = "0.6.7";
 
   src = fetchFromCodeberg {
     owner = "Piturnah";
     repo = "gex";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Xer7a3UtFIv3idchI7DfZ5u6qgDW/XFWi5ihtcREXqo=";
+    hash = "sha256-L8AHJ7h2lNx04nJ//2DjH3CdnuQGMqcta0+XzJjRNb4=";
   };
 
   nativeBuildInputs = [ pkg-config ];
@@ -33,11 +33,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     LIBGIT2_NO_VENDOR = 1;
   };
 
-  cargoPatches = [
-    ./patch-libgit2.patch
-  ];
-
-  cargoHash = "sha256-4ejtMCuJOwT5bJQZaPQ1OjrB5O70we77yEXk9RmhywE=";
+  cargoHash = "sha256-FdxBYDgDxpZqqYzjX+lWP+uP2jUD3Y5Rzyx+JasAgIY=";
 
   meta = {
     description = "Git Explorer: cross-platform git workflow improvement tool inspired by Magit";
diff --git a/pkgs/by-name/ge/gex/patch-libgit2.patch b/pkgs/by-name/ge/gex/patch-libgit2.patch
deleted file mode 100644
index d540c71fa456..000000000000
--- a/pkgs/by-name/ge/gex/patch-libgit2.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 3f9183a4de984c5d24caa9379274461e369926ed Mon Sep 17 00:00:00 2001
-From: wxt <3264117476@qq.com>
-Date: Sun, 8 Sep 2024 18:36:46 +0800
-Subject: [PATCH] tt
-
----
- Cargo.lock | 8 ++++----
- Cargo.toml | 2 +-
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/Cargo.lock b/Cargo.lock
-index 5101c2e..0cb59d2 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -246,9 +246,9 @@ dependencies = [
- 
- [[package]]
- name = "git2"
--version = "0.18.1"
-+version = "0.20.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "fbf97ba92db08df386e10c8ede66a2a0369bd277090afd8710e19e38de9ec0cd"
-+checksum = "3fda788993cc341f69012feba8bf45c0ba4f3291fcc08e214b4d5a7332d88aff"
- dependencies = [
-  "bitflags 2.3.3",
-  "libc",
-@@ -316,9 +316,9 @@ checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
- 
- [[package]]
- name = "libgit2-sys"
--version = "0.16.1+1.7.1"
-+version = "0.18.0+1.9.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "f2a2bb3680b094add03bb3732ec520ece34da31a8cd2d633d1389d0f0fb60d0c"
-+checksum = "e1a117465e7e1597e8febea8bb0c410f1c7fb93b1e1cddf34363f8390367ffec"
- dependencies = [
-  "cc",
-  "libc",
-diff --git a/Cargo.toml b/Cargo.toml
-index 26cef3f..f947945 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -16,7 +16,7 @@ anyhow = "1.0.75"
- clap = { version = "4.4.7", features = ["cargo", "derive"] }
- crossterm = { version = "0.27.0", features = ["serde"] }
- dirs = "5.0.1"
--git2 = { version = "0.18.1", default-features = false }
-+git2 = { version = "0.20.0", default-features = false }
- itertools = "0.11.0"
- nom = "7.1.3"
- paste = "1.0.14"
--- 
-2.46.0
-