diff --git a/pkgs/by-name/cl/clash-rs/Cargo.patch b/pkgs/by-name/cl/clash-rs/Cargo.patch index 495f4b398622..9c1141bdb9e9 100644 --- a/pkgs/by-name/cl/clash-rs/Cargo.patch +++ b/pkgs/by-name/cl/clash-rs/Cargo.patch @@ -1,6 +1,6 @@ --- a/Cargo.lock +++ b/Cargo.lock -@@ -1462,7 +1462,7 @@ +@@ -1250,7 +1250,7 @@ "sha2", "shadowquic", "shadowsocks", @@ -8,8 +8,8 @@ + "smoltcp 0.12.0", "socket2 0.6.0", "tempfile", - "thiserror 2.0.15", -@@ -4439,7 +4439,7 @@ + "thiserror 2.0.17", +@@ -4096,7 +4096,7 @@ "etherparse 0.16.0", "futures", "rand 0.8.5", @@ -18,9 +18,9 @@ "spin 0.9.8", "tokio", "tokio-util", -@@ -6892,20 +6892,6 @@ +@@ -6487,20 +6487,6 @@ ] - + [[package]] -name = "smoltcp" -version = "0.12.0" @@ -39,7 +39,7 @@ name = "socket2" version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -@@ -9231,7 +9217,7 @@ +@@ -8792,7 +8778,7 @@ "netstack-lwip", "netstack-smoltcp", "rand 0.9.2", diff --git a/pkgs/by-name/cl/clash-rs/package.nix b/pkgs/by-name/cl/clash-rs/package.nix index ff1c67a6eee1..05a379a7fb13 100644 --- a/pkgs/by-name/cl/clash-rs/package.nix +++ b/pkgs/by-name/cl/clash-rs/package.nix @@ -10,16 +10,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "clash-rs"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "Watfaq"; repo = "clash-rs"; tag = "v${finalAttrs.version}"; - hash = "sha256-OwoDvcGpuU2x6O3+rBJSXGS2VoeFt/oVgFWUaCUyC8E="; + hash = "sha256-asD7veAYdIF5biCbSXYvAyW/qBra3tvON9TQYCw6nB8="; }; - cargoHash = "sha256-HKW6bOkHkBINwA2tgaKHEozKzT4n54roj6W989JUoAQ="; + cargoHash = "sha256-9zCQKxkjiskkBGxfnq2ANpqWobs+UJ5qCsbME2Z7GY4="; cargoPatches = [ ./Cargo.patch ]; @@ -46,13 +46,11 @@ rustPlatform.buildRustPackage (finalAttrs: { env = { # requires features: sync_unsafe_cell, unbounded_shifts, let_chains, ip RUSTC_BOOTSTRAP = 1; + RUSTFLAGS = "--cfg tokio_unstable"; + NIX_CFLAGS_COMPILE = "-Wno-error"; }; - buildFeatures = [ - "shadowsocks" - "tuic" - "onion" - ]; + buildFeatures = [ "plus" ]; doCheck = false; # test failed diff --git a/pkgs/by-name/cl/clash-rs/unbounded-shifts.patch b/pkgs/by-name/cl/clash-rs/unbounded-shifts.patch index 08d50ecb5e49..679bb20745fa 100644 --- a/pkgs/by-name/cl/clash-rs/unbounded-shifts.patch +++ b/pkgs/by-name/cl/clash-rs/unbounded-shifts.patch @@ -1,11 +1,11 @@ --- a/clash-lib/src/lib.rs +++ b/clash-lib/src/lib.rs -@@ -4,7 +4,7 @@ - #![feature(let_chains)] +@@ -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)] - - #[macro_use] - extern crate anyhow; + #![cfg_attr(not(version("1.88.0")), feature(let_chains))] + + use crate::{