From 6da45c91d53dc318df7482a0be7c7bf47515e1e2 Mon Sep 17 00:00:00 2001 From: HHR2020 <76608828+HHR2020@users.noreply.github.com> Date: Mon, 23 Mar 2026 19:19:37 +0800 Subject: [PATCH] clash-verge-rev: 2.4.6 -> 2.4.7 --- pkgs/by-name/cl/clash-verge-rev/package.nix | 8 ++-- .../cl/clash-verge-rev/patch-cargo-lock.patch | 39 ------------------- pkgs/by-name/cl/clash-verge-rev/unwrapped.nix | 5 --- 3 files changed, 4 insertions(+), 48 deletions(-) delete mode 100644 pkgs/by-name/cl/clash-verge-rev/patch-cargo-lock.patch diff --git a/pkgs/by-name/cl/clash-verge-rev/package.nix b/pkgs/by-name/cl/clash-verge-rev/package.nix index 459f4f5e96a8..003514ae76e8 100644 --- a/pkgs/by-name/cl/clash-verge-rev/package.nix +++ b/pkgs/by-name/cl/clash-verge-rev/package.nix @@ -13,17 +13,17 @@ let pname = "clash-verge-rev"; # Please keep service version in sync - version = "2.4.6"; + version = "2.4.7"; src = fetchFromGitHub { owner = "clash-verge-rev"; repo = "clash-verge-rev"; tag = "v${version}"; - hash = "sha256-s/dUy9vYxdUlAahVPkoOHjoF+WCl3xhJOubZtS1PB5o="; + hash = "sha256-Jw9GXD0RFFPkqhJuNZaooxIHVDt1ti0a4g863jIwtkY="; }; - pnpm-hash = "sha256-7xNaLlnXLty80x1d25pBeLZUu0r3R+87DYoJ6rTHSTA="; - vendor-hash = "sha256-1b0vmx0apWSNlaTMR58eufinBuIC7/F3UG3C8X62/gE="; + pnpm-hash = "sha256-2iGCe9LmH99hVOWEWkDy7/XH4r/Jlr8rzL5FrCRpn3Q="; + vendor-hash = "sha256-EHsGCrphP6SRQ04Q0sIh8CmzMwbvqDQeiL44ItBGIaM="; service = callPackage ./service.nix { inherit diff --git a/pkgs/by-name/cl/clash-verge-rev/patch-cargo-lock.patch b/pkgs/by-name/cl/clash-verge-rev/patch-cargo-lock.patch deleted file mode 100644 index f9c2ac1c9f85..000000000000 --- a/pkgs/by-name/cl/clash-verge-rev/patch-cargo-lock.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index d5895c0b..a7954a89 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -7255,7 +7255,7 @@ dependencies = [ - "once_cell", - "parking_lot", - "raw-window-handle", -- "tao-macros 0.1.3 (git+https://github.com/tauri-apps/tao)", -+ "tao-macros", - "unicode-segmentation", - "url", - "windows 0.61.3", -@@ -7275,16 +7275,6 @@ dependencies = [ - "syn 2.0.114", - ] - --[[package]] --name = "tao-macros" --version = "0.1.3" --source = "git+https://github.com/tauri-apps/tao#a133504b6dc963a5ad7786e01e746dba72236b65" --dependencies = [ -- "proc-macro2", -- "quote", -- "syn 2.0.114", --] -- - [[package]] - name = "tap" - version = "1.0.1" -@@ -10040,7 +10030,7 @@ dependencies = [ - "raw-window-handle", - "sha2 0.10.9", - "soup3", -- "tao-macros 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "tao-macros", - "thiserror 2.0.18", - "tracing", - "url", diff --git a/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix b/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix index 7b1498977656..646fda10453c 100644 --- a/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix +++ b/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix @@ -46,11 +46,6 @@ rustPlatform.buildRustPackage { OPENSSL_NO_VENDOR = 1; }; - cargoPatches = [ - # Duplicate versions of tao-macros make fetchCargoVendor fail, keep one of them. - ./patch-cargo-lock.patch - ]; - postPatch = '' # We disable the option to try to use the bleeding-edge version of mihomo # If you need a newer version, you can override the mihomo input of the wrapped package