From 4919484fe1b187f00d1ff10c1215c0a6ea48a2f4 Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Tue, 17 Mar 2026 01:28:09 +0000
Subject: [PATCH] clash-rs: 0.9.5 -> 0.9.6

---
 pkgs/by-name/cl/clash-rs/Cargo.patch          | 50 -------------------
 pkgs/by-name/cl/clash-rs/package.nix          | 17 ++-----
 .../cl/clash-rs/unbounded-shifts.patch        | 11 ----
 3 files changed, 3 insertions(+), 75 deletions(-)
 delete mode 100644 pkgs/by-name/cl/clash-rs/Cargo.patch
 delete mode 100644 pkgs/by-name/cl/clash-rs/unbounded-shifts.patch

diff --git a/pkgs/by-name/cl/clash-rs/Cargo.patch b/pkgs/by-name/cl/clash-rs/Cargo.patch
deleted file mode 100644
index af1c5dc5295f..000000000000
--- a/pkgs/by-name/cl/clash-rs/Cargo.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -1265,7 +1265,7 @@
-  "sha2 0.10.9",
-  "shadowquic",
-  "shadowsocks",
-- "smoltcp 0.12.0 (git+https://github.com/smoltcp-rs/smoltcp.git?rev=ac32e64)",
-+ "smoltcp",
-  "sock2proc",
-  "socket2 0.6.2",
-  "ssh-key",
-@@ -4636,7 +4636,7 @@
-  "etherparse 0.16.0",
-  "futures",
-  "rand 0.8.5",
-- "smoltcp 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "smoltcp",
-  "spin 0.9.8",
-  "tokio",
-  "tokio-util",
-@@ -7293,20 +7293,6 @@
- ]
- 
- [[package]]
--name = "smoltcp"
--version = "0.12.0"
--source = "git+https://github.com/smoltcp-rs/smoltcp.git?rev=ac32e64#ac32e643a4b7e09161193071526b3ca5a0deedb5"
--dependencies = [
-- "bitflags 1.3.2",
-- "byteorder",
-- "cfg-if",
-- "defmt 0.3.100",
-- "heapless",
-- "log",
-- "managed",
--]
--
--[[package]]
- name = "sock2proc"
- version = "0.1.0"
- source = "git+https://github.com/Watfaq/sock2proc.git?rev=9f9e630#9f9e6304d62285115b2e4fa632527ae563bf0fcc"
-@@ -9797,7 +9783,7 @@
-  "netstack-lwip",
-  "netstack-smoltcp",
-  "rand 0.9.2",
-- "smoltcp 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "smoltcp",
-  "socket2 0.6.2",
-  "tokio",
-  "tracing",
diff --git a/pkgs/by-name/cl/clash-rs/package.nix b/pkgs/by-name/cl/clash-rs/package.nix
index 84066d4088a5..caa92e288d37 100644
--- a/pkgs/by-name/cl/clash-rs/package.nix
+++ b/pkgs/by-name/cl/clash-rs/package.nix
@@ -10,27 +10,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "clash-rs";
-  version = "0.9.5";
+  version = "0.9.6";
 
   src = fetchFromGitHub {
     owner = "Watfaq";
     repo = "clash-rs";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ymxT6AGBDTfiMbpU4Ou/SwAnUZF3vKvtt/BgWRtQTJc=";
+    hash = "sha256-5o98Yj8a30Tn/Cf3QMZ5EaCjCgD3XttqaHHuIjBWg4s=";
   };
 
-  cargoHash = "sha256-G1RLUFnQVX6tbLIF6ql6RDGZUwGPGFBHgx15KT3/tNQ=";
-
-  cargoPatches = [ ./Cargo.patch ];
-
-  patches = [
-    ./unbounded-shifts.patch
-  ];
-
-  postPatch = ''
-    substituteInPlace clash-lib/Cargo.toml \
-      --replace-fail ', git = "https://github.com/smoltcp-rs/smoltcp.git", rev = "ac32e64"' ""
-  '';
+  cargoHash = "sha256-tRAkA64D2UOEqLbkKiSBDbNlvX7tejSJwYF7+VwicAk=";
 
   nativeBuildInputs = [
     cmake
diff --git a/pkgs/by-name/cl/clash-rs/unbounded-shifts.patch b/pkgs/by-name/cl/clash-rs/unbounded-shifts.patch
deleted file mode 100644
index 679bb20745fa..000000000000
--- a/pkgs/by-name/cl/clash-rs/unbounded-shifts.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/clash-lib/src/lib.rs
-+++ b/clash-lib/src/lib.rs
-@@ -3,7 +3,7 @@
- #![feature(sync_unsafe_cell)]
- #![feature(lazy_get)]
- #![feature(duration_millis_float)]
--#![cfg_attr(not(version("1.87.0")), feature(unbounded_shifts))]
-+#![feature(unbounded_shifts)]
- #![cfg_attr(not(version("1.88.0")), feature(let_chains))]
- 
- use crate::{