From 3e9c061f090b49eeb58f5504fd7fb2de44657598 Mon Sep 17 00:00:00 2001 From: qzylinra Date: Thu, 14 Aug 2025 17:27:17 +0800 Subject: [PATCH] clash-rs: 0.7.7 -> 0.8.2 --- pkgs/by-name/cl/clash-rs/package.nix | 14 +++++++++++--- pkgs/by-name/cl/clash-rs/unbounded-shifts.patch | 16 +++++++--------- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/cl/clash-rs/package.nix b/pkgs/by-name/cl/clash-rs/package.nix index b5611a03b517..29e996040e9f 100644 --- a/pkgs/by-name/cl/clash-rs/package.nix +++ b/pkgs/by-name/cl/clash-rs/package.nix @@ -4,24 +4,32 @@ rustPlatform, protobuf, versionCheckHook, + cmake, + pkg-config, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "clash-rs"; - version = "0.7.7"; + version = "0.8.2"; src = fetchFromGitHub { owner = "Watfaq"; repo = "clash-rs"; tag = "v${finalAttrs.version}"; - hash = "sha256-x89sFBQ6bAIHvaRTCxqKKgFKo7PpquVze0R6VicwrJw="; + hash = "sha256-HkIsflsLTQdvetgamLt6LbYxOpv1+FQ/e/PzJjKOfq4="; }; - cargoHash = "sha256-jfc0Rmt9eEN3ds5Rakj+IcJcUa28CbhiSu4AfqHurf0="; + cargoHash = "sha256-Qh/YxNO/DtVBj6Eiloc3+Fs+dQqvAXSe+5lCer0F2zs="; patches = [ ./unbounded-shifts.patch ]; + nativeBuildInputs = [ + cmake + pkg-config + rustPlatform.bindgenHook + ]; + nativeInstallCheckInputs = [ protobuf versionCheckHook diff --git a/pkgs/by-name/cl/clash-rs/unbounded-shifts.patch b/pkgs/by-name/cl/clash-rs/unbounded-shifts.patch index ab6c43b7a264..08d50ecb5e49 100644 --- a/pkgs/by-name/cl/clash-rs/unbounded-shifts.patch +++ b/pkgs/by-name/cl/clash-rs/unbounded-shifts.patch @@ -1,13 +1,11 @@ -diff --git a/clash_lib/src/lib.rs b/clash_lib/src/lib.rs -index 6ada034..420e465 100644 ---- a/clash_lib/src/lib.rs -+++ b/clash_lib/src/lib.rs -@@ -2,7 +2,7 @@ - #![feature(ip)] - #![feature(sync_unsafe_cell)] +--- a/clash-lib/src/lib.rs ++++ b/clash-lib/src/lib.rs +@@ -4,7 +4,7 @@ #![feature(let_chains)] --#![cfg_attr(not(version("1.86.0")), feature(unbounded_shifts))] + #![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;