From ab3ddc974dd63df2bacd308a46a3cf52f26520dc Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Mon, 26 Jan 2026 20:15:19 +0800 Subject: [PATCH] clipcat: 0.21.1 -> 0.24.0 --- pkgs/by-name/cl/clipcat/dummy.patch | 14 ------------ pkgs/by-name/cl/clipcat/package.nix | 14 +++--------- .../remove_unnecessary_parenthesis.patch | 22 ------------------- 3 files changed, 3 insertions(+), 47 deletions(-) delete mode 100644 pkgs/by-name/cl/clipcat/dummy.patch delete mode 100644 pkgs/by-name/cl/clipcat/remove_unnecessary_parenthesis.patch diff --git a/pkgs/by-name/cl/clipcat/dummy.patch b/pkgs/by-name/cl/clipcat/dummy.patch deleted file mode 100644 index 4fdc3d60526a..000000000000 --- a/pkgs/by-name/cl/clipcat/dummy.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/crates/server/src/notification/dummy.rs b/crates/server/src/notification/dummy.rs -index f85dda0..7489f22 100644 ---- a/crates/server/src/notification/dummy.rs -+++ b/crates/server/src/notification/dummy.rs -@@ -1,6 +1,9 @@ -+#[cfg(test)] - use crate::notification::traits; - -+#[cfg(test)] - #[derive(Clone, Copy, Debug, Default)] - pub struct Notification {} - -+#[cfg(test)] - impl traits::Notification for Notification {} diff --git a/pkgs/by-name/cl/clipcat/package.nix b/pkgs/by-name/cl/clipcat/package.nix index 4cb922c4f8e2..1e245f33c6c4 100644 --- a/pkgs/by-name/cl/clipcat/package.nix +++ b/pkgs/by-name/cl/clipcat/package.nix @@ -10,24 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "clipcat"; - version = "0.21.1"; + version = "0.24.0"; src = fetchFromGitHub { owner = "xrelkd"; repo = "clipcat"; tag = "v${version}"; - hash = "sha256-MYWkUb9v8hnW6gUTpIcz0+jhlc8y3hZxsEQxRIZVVxI="; + hash = "sha256-EEM2gwr5j3umpZqHnxCO81EZbLQ3nYGcxb6DBJ7AbC8="; }; - cargoHash = "sha256-7ntsq6x/8QFaU6Hl4tk+Rtvc8ttcK9Mp00nlirNlUKY="; - - patches = [ - # Fix compilation errors caused by stricter restrictions on unused code in Rust 1.89. - # TODO: remove this patch after upstream fix it. - ./dummy.patch - # https://github.com/xrelkd/clipcat/pull/871 - ./remove_unnecessary_parenthesis.patch - ]; + cargoHash = "sha256-6fS/LnfNi3rH4H61GCdLp6pnfGPIXJiY2dAwKdK5ofk="; nativeBuildInputs = [ protobuf diff --git a/pkgs/by-name/cl/clipcat/remove_unnecessary_parenthesis.patch b/pkgs/by-name/cl/clipcat/remove_unnecessary_parenthesis.patch deleted file mode 100644 index 54b8caa86c0c..000000000000 --- a/pkgs/by-name/cl/clipcat/remove_unnecessary_parenthesis.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 76e3ce46eb930dbc51c3e7aeb832a9db6194fd34 Mon Sep 17 00:00:00 2001 -From: sandroid -Date: Sun, 9 Nov 2025 22:12:03 +0100 -Subject: [PATCH] fix(crates/server): remove unnecessary parentheses - ---- - crates/server/src/snippets/mod.rs | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/crates/server/src/snippets/mod.rs b/crates/server/src/snippets/mod.rs -index 00759b1e..8a43c326 100644 ---- a/crates/server/src/snippets/mod.rs -+++ b/crates/server/src/snippets/mod.rs -@@ -39,7 +39,7 @@ async fn load(config: &config::SnippetConfig) -> HashMap