clash-rs: 0.9.5 -> 0.9.6

This commit is contained in:
kyehn
2026-03-23 04:45:48 +00:00
parent b1187734fb
commit 4919484fe1
3 changed files with 3 additions and 75 deletions
-50
View File
@@ -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",
+3 -14
View File
@@ -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
@@ -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::{