From 3bc991b00fdadf7ef7b2eedcc38febc0f6be8270 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Thu, 16 Apr 2026 10:56:43 +1000
Subject: [PATCH 1/4] rasdaemon: add maintainer

---
 pkgs/by-name/ra/rasdaemon/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ra/rasdaemon/package.nix b/pkgs/by-name/ra/rasdaemon/package.nix
index 07cbc1bf030a..7daa019e2466 100644
--- a/pkgs/by-name/ra/rasdaemon/package.nix
+++ b/pkgs/by-name/ra/rasdaemon/package.nix
@@ -122,6 +122,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.linux;
     changelog = "${finalAttrs.meta.homepage}/releases/tag/v${finalAttrs.version}";
-    maintainers = [ ];
+    maintainers = [ lib.maintainers.zowoq ];
   };
 })

From 10cfa23144e9aece536ff2014725eea5162d6246 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Thu, 16 Apr 2026 10:56:42 +1000
Subject: [PATCH 2/4] nixos/rasdaemon: inherit maintainers from package

---
 nixos/modules/services/hardware/rasdaemon.nix | 4 ++++
 nixos/tests/rasdaemon.nix                     | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/hardware/rasdaemon.nix b/nixos/modules/services/hardware/rasdaemon.nix
index cc1723793b9e..b33eb93ea085 100644
--- a/nixos/modules/services/hardware/rasdaemon.nix
+++ b/nixos/modules/services/hardware/rasdaemon.nix
@@ -10,6 +10,10 @@ let
 
 in
 {
+  meta = {
+    inherit (pkgs.rasdaemon.meta) maintainers;
+  };
+
   options.hardware.rasdaemon = {
 
     enable = lib.mkEnableOption "RAS logging daemon";
diff --git a/nixos/tests/rasdaemon.nix b/nixos/tests/rasdaemon.nix
index c8fc97808e50..a67c34578a6a 100644
--- a/nixos/tests/rasdaemon.nix
+++ b/nixos/tests/rasdaemon.nix
@@ -1,8 +1,8 @@
-{ ... }:
+{ pkgs, ... }:
 {
   name = "rasdaemon";
   meta = {
-    maintainers = [ ];
+    inherit (pkgs.rasdaemon.meta) maintainers;
     broken = true; # test timed out
   };
 

From 21d46f4397692d883ac45d307b28f6159e6bc363 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Thu, 16 Apr 2026 10:43:01 +1000
Subject: [PATCH 3/4] rasdaemon: add patch for ras-mc-ctl

---
 pkgs/by-name/ra/rasdaemon/package.nix               |  5 +++++
 ..._fix_invalid_column_in_signal_events_query.patch | 13 +++++++++++++
 2 files changed, 18 insertions(+)
 create 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 7daa019e2466..c8756368c802 100644
--- a/pkgs/by-name/ra/rasdaemon/package.nix
+++ b/pkgs/by-name/ra/rasdaemon/package.nix
@@ -26,6 +26,11 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-rk4CZrWQRe2wsx8/eXP0BIeaU/Gxmcb+Kry5F8t4YKQ=";
   };
 
+  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
new file mode 100644
index 000000000000..88facf5c6001
--- /dev/null
+++ b/pkgs/by-name/ra/rasdaemon/ras-mc-ctl_fix_invalid_column_in_signal_events_query.patch
@@ -0,0 +1,13 @@
+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));

From bb3fb72adea545ef02488ac2cfa6870e497f99a7 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Thu, 16 Apr 2026 11:15:54 +1000
Subject: [PATCH 4/4] Revert "nixosTests.rasdaemon: mark as broken"

This reverts commit 57d2a63b1106999ce6436db91cc20bac967c1cc0.
---
 nixos/tests/rasdaemon.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/tests/rasdaemon.nix b/nixos/tests/rasdaemon.nix
index a67c34578a6a..b6f6bcbe658b 100644
--- a/nixos/tests/rasdaemon.nix
+++ b/nixos/tests/rasdaemon.nix
@@ -3,7 +3,6 @@
   name = "rasdaemon";
   meta = {
     inherit (pkgs.rasdaemon.meta) maintainers;
-    broken = true; # test timed out
   };
 
   nodes.machine =