From d39440d27c78909cf2ee10a8fb75e60f591d9bb4 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sat, 27 Jun 2026 08:19:55 +1000
Subject: [PATCH] rasdaemon: 0.8.4 -> 0.8.5

Diff: https://github.com/mchehab/rasdaemon/compare/v0.8.4...v0.8.5

Changelog: https://github.com/mchehab/rasdaemon/releases/tag/v0.8.5
---
 pkgs/by-name/ra/rasdaemon/package.nix               |  9 ++-------
 ..._fix_invalid_column_in_signal_events_query.patch | 13 -------------
 2 files changed, 2 insertions(+), 20 deletions(-)
 delete mode 100644 pkgs/by-name/ra/rasdaemon/ras-mc-ctl_fix_invalid_column_in_signal_events_query.patch

diff --git a/pkgs/by-name/ra/rasdaemon/package.nix b/pkgs/by-name/ra/rasdaemon/package.nix
index c8756368c802..c5e50ed8f49c 100644
--- a/pkgs/by-name/ra/rasdaemon/package.nix
+++ b/pkgs/by-name/ra/rasdaemon/package.nix
@@ -17,20 +17,15 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rasdaemon";
-  version = "0.8.4";
+  version = "0.8.5";
 
   src = fetchFromGitHub {
     owner = "mchehab";
     repo = "rasdaemon";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-rk4CZrWQRe2wsx8/eXP0BIeaU/Gxmcb+Kry5F8t4YKQ=";
+    hash = "sha256-CN9fSo7CQFkbpxPRwFSNJovTJBAjqEhqQzwHfYirGmo=";
   };
 
-  patches = [
-    # https://github.com/mchehab/rasdaemon/pull/246
-    ./ras-mc-ctl_fix_invalid_column_in_signal_events_query.patch
-  ];
-
   strictDeps = true;
 
   enableParallelBuilding = true;
diff --git a/pkgs/by-name/ra/rasdaemon/ras-mc-ctl_fix_invalid_column_in_signal_events_query.patch b/pkgs/by-name/ra/rasdaemon/ras-mc-ctl_fix_invalid_column_in_signal_events_query.patch
deleted file mode 100644
index 88facf5c6001..000000000000
--- a/pkgs/by-name/ra/rasdaemon/ras-mc-ctl_fix_invalid_column_in_signal_events_query.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/util/ras-mc-ctl.in b/util/ras-mc-ctl.in
-index b00c9c1..e56402b 100755
---- a/util/ras-mc-ctl.in
-+++ b/util/ras-mc-ctl.in
-@@ -2497,7 +2497,7 @@ sub errors
- 
-     # SIGNAL event
-     if ($has_signal == 1) {
--	$query = "select id, timestamp, signal, errorno, code, comm, pid, grp, res from signal_event$conf{opt}{since} order by id";
-+	$query = "select id, timestamp, sig, errorno, code, comm, pid, grp, res from signal_event$conf{opt}{since} order by id";
- 	$query_handle = $dbh->prepare($query);
- 	$query_handle->execute();
- 	$query_handle->bind_columns(\($id, $timestamp, $signal, $errorno, $code, $comm, $pid, $grp, $res));