From e3b2054b1588d679d1b7bcbec47703a28c348d14 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Wed, 6 May 2026 16:35:31 +0700
Subject: [PATCH 1/2] rustus: fix build

---
 pkgs/by-name/ru/rustus/bump-mobc.patch | 57 ++++++++++++++++++++++++++
 pkgs/by-name/ru/rustus/package.nix     |  6 ++-
 2 files changed, 62 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/by-name/ru/rustus/bump-mobc.patch

diff --git a/pkgs/by-name/ru/rustus/bump-mobc.patch b/pkgs/by-name/ru/rustus/bump-mobc.patch
new file mode 100644
index 000000000000..d3b1038dfae9
--- /dev/null
+++ b/pkgs/by-name/ru/rustus/bump-mobc.patch
@@ -0,0 +1,57 @@
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -33,7 +33,7 @@
+ sentry-actix = "0.35.0"
+ mime = "0.3.17"
+ mime_guess = "2.0.5"
+-mobc = "0.8.5"
++mobc = "0.9.0"
+ rust-s3 = "~0.35.1"
+ futures = "^0.3.31"
+ lapin = "^2.5.0"
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -2295,12 +2295,12 @@
+ 
+ [[package]]
+ name = "metrics"
+-version = "0.23.0"
++version = "0.24.5"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "884adb57038347dfbaf2d5065887b6cf4312330dc8e94bc30a1a839bd79d3261"
++checksum = "ff56c2e7dce6bd462e3b8919986a617027481b1dcc703175b58cf9dd98a2f071"
+ dependencies = [
+- "ahash",
+  "portable-atomic",
++ "rapidhash",
+ ]
+ 
+ [[package]]
+@@ -2357,9 +2357,9 @@
+ 
+ [[package]]
+ name = "mobc"
+-version = "0.8.5"
++version = "0.9.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "316a7d198b51958a0ab57248bf5f42d8409551203cb3c821d5925819a8d5415f"
++checksum = "4ee4c321f7581ff6d3b02c1fd05dc0b1f17c05f23c8532d1af9413890ab5fab5"
+ dependencies = [
+  "async-trait",
+  "futures-channel",
+@@ -2930,6 +2930,15 @@
+ ]
+ 
+ [[package]]
++name = "rapidhash"
++version = "4.4.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b5e48930979c155e2f33aa36ab3119b5ee81332beb6482199a8ecd6029b80b59"
++dependencies = [
++ "rustversion",
++]
++
++[[package]]
+ name = "rc2"
+ version = "0.8.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
diff --git a/pkgs/by-name/ru/rustus/package.nix b/pkgs/by-name/ru/rustus/package.nix
index b9af89403dd9..f4ddccd8f64e 100644
--- a/pkgs/by-name/ru/rustus/package.nix
+++ b/pkgs/by-name/ru/rustus/package.nix
@@ -19,7 +19,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-ALnb6ICg+TZRuHayhozwJ5+imabgjBYX4W42ydhkzv0=";
   };
 
-  cargoHash = "sha256-df92+gp/DtdHwPxJF89zKHjmVWzfrjnD8wAlrPRyyxk=";
+  # Bump mobc 0.8.5 -> 0.9.0 to pull in metrics >= 0.24.2, which fixes a borrow-checker error under newer rustc
+  # (https://github.com/rust-lang/rust/issues/141402).
+  cargoPatches = [ ./bump-mobc.patch ];
+
+  cargoHash = "sha256-FyuUdskTEGiBs7qC7cv1u8d4BCZ2IEOduhAe3m4IDV0=";
 
   env = {
     OPENSSL_NO_VENDOR = 1;

From d5dc94b64befa018cbdd5b962de64e29a758e1e0 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Wed, 6 May 2026 19:28:01 +0700
Subject: [PATCH 2/2] rustus: skip flaky file_notifier success test

---
 pkgs/by-name/ru/rustus/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/ru/rustus/package.nix b/pkgs/by-name/ru/rustus/package.nix
index f4ddccd8f64e..a00c5632cec4 100644
--- a/pkgs/by-name/ru/rustus/package.nix
+++ b/pkgs/by-name/ru/rustus/package.nix
@@ -58,6 +58,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "--skip=notifiers::impls::http_notifier::tests::unknown_url"
     "--skip=notifiers::impls::kafka_notifier::test::simple_success_on_prefix"
     "--skip=notifiers::impls::kafka_notifier::test::simple_success_on_topic"
+
+    # flaky: ETXTBSY race on parallel fork/exec
+    "--skip=notifiers::impls::file_notifier::tests::success"
   ];
 
   meta = {