From 1e0f951c2bff324872d66cb79f49b3a83fb53b5d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 28 May 2026 00:40:27 +0200
Subject: [PATCH 1/3] reaction: 2.3.1 -> 2.4.0

https://framagit.org/ppom/reaction/-/releases/v2.4.0
(cherry picked from commit ff099fc9e93fe14b99a9dec41112aa7e99b076ed)
---
 pkgs/by-name/re/reaction/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/re/reaction/package.nix b/pkgs/by-name/re/reaction/package.nix
index a0a15d0b128e..c3876c524b69 100644
--- a/pkgs/by-name/re/reaction/package.nix
+++ b/pkgs/by-name/re/reaction/package.nix
@@ -13,17 +13,17 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "reaction";
-  version = "2.3.1";
+  version = "2.4.0";
 
   src = fetchFromGitLab {
     domain = "framagit.org";
     owner = "ppom";
     repo = "reaction";
-    rev = "c0868d6fe1d155de183a89729b5f3f0ede7be4a2"; # TODO: return to tagged release
-    hash = "sha256-QlSXZ2Wk1OXzAY2x6YjtW+xNchY+Ghb/6AsJgjfgoFE=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-Y6scgbcwhg56SQ1DefNtdja+n89Gc5bJUHKHKn2EYwQ=";
   };
 
-  cargoHash = "sha256-FYd7I93MAAzD6y0VMd9kMU7DAgS6v5CKt2KjrskaKeo=";
+  cargoHash = "sha256-NAcMpASvphAqjBjbAPWLG5qZbSgdaFC3GvU25exCS3g=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 2d3e3eecc8a0bc27688b7135046df887a56c4a49 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 28 May 2026 00:46:34 +0200
Subject: [PATCH 2/3] reaction: build plugins in passthru

(cherry picked from commit d961402c8f1faaebe1b40774b6d729116fbc7c47)
---
 pkgs/by-name/re/reaction/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/re/reaction/package.nix b/pkgs/by-name/re/reaction/package.nix
index c3876c524b69..8dba09fad8c8 100644
--- a/pkgs/by-name/re/reaction/package.nix
+++ b/pkgs/by-name/re/reaction/package.nix
@@ -66,7 +66,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
   passthru = {
     inherit (callPackage ./plugins { }) mkReactionPlugin plugins;
     updateScript = nix-update-script { };
-    tests = nixosTests.reaction;
+    tests = {
+      inherit (nixosTests) reaction;
+    }
+    // finalAttrs.passthru.plugins;
   };
 
   meta = {

From 1878b8943d756e62c725be65f5cf94f2e709292c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 28 May 2026 01:03:03 +0200
Subject: [PATCH 3/3] reaction: port patch for aarch64-linux nftables compat

This patch is merged upstream and can be reverted on the next update.

Fetchpatch does not work against framagit.org, which is why I vendored
the patch instead.

(cherry picked from commit 1a7b7c7ddff42c2b8f871e23c684fa629b9c96ef)
---
 .../nftables-aarch64-linux-compat.patch       | 33 +++++++++++++++++++
 pkgs/by-name/re/reaction/package.nix          |  6 ++++
 pkgs/by-name/re/reaction/plugins/default.nix  |  7 +++-
 3 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/by-name/re/reaction/nftables-aarch64-linux-compat.patch

diff --git a/pkgs/by-name/re/reaction/nftables-aarch64-linux-compat.patch b/pkgs/by-name/re/reaction/nftables-aarch64-linux-compat.patch
new file mode 100644
index 000000000000..bd25eb2122a4
--- /dev/null
+++ b/pkgs/by-name/re/reaction/nftables-aarch64-linux-compat.patch
@@ -0,0 +1,33 @@
+From 94fafae651077be5e7a6dfd29fc06327a2f218ed Mon Sep 17 00:00:00 2001
+From: ppom <reaction@ppom.me>
+Date: Thu, 28 May 2026 12:00:00 +0200
+Subject: [PATCH] nftables: fix compilation on aarch64-linux
+
+---
+ plugins/reaction-plugin-nftables/src/nft.rs | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/plugins/reaction-plugin-nftables/src/nft.rs b/plugins/reaction-plugin-nftables/src/nft.rs
+index c234f77..2ac49df 100644
+--- a/plugins/reaction-plugin-nftables/src/nft.rs
++++ b/plugins/reaction-plugin-nftables/src/nft.rs
+@@ -1,5 +1,6 @@
+ use std::{
+     ffi::{CStr, CString},
++    os::raw::c_char,
+     thread,
+ };
+ 
+@@ -71,7 +72,7 @@ struct NftCommand {
+     ret: oneshot::Sender<Result<String, String>>,
+ }
+ 
+-fn to_rust_string(c_ptr: *const i8) -> Option<String> {
++fn to_rust_string(c_ptr: *const c_char) -> Option<String> {
+     if c_ptr.is_null() {
+         None
+     } else {
+-- 
+GitLab
+
+
diff --git a/pkgs/by-name/re/reaction/package.nix b/pkgs/by-name/re/reaction/package.nix
index 8dba09fad8c8..4515bdc356dc 100644
--- a/pkgs/by-name/re/reaction/package.nix
+++ b/pkgs/by-name/re/reaction/package.nix
@@ -4,6 +4,7 @@
   callPackage,
   rustPlatform,
   fetchFromGitLab,
+  fetchpatch,
 
   versionCheckHook,
   installShellFiles,
@@ -23,6 +24,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-Y6scgbcwhg56SQ1DefNtdja+n89Gc5bJUHKHKn2EYwQ=";
   };
 
+  patches = [
+    # nftables: fix compilation on aarch64-linux; remove in 2.4.1
+    ./nftables-aarch64-linux-compat.patch
+  ];
+
   cargoHash = "sha256-NAcMpASvphAqjBjbAPWLG5qZbSgdaFC3GvU25exCS3g=";
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/re/reaction/plugins/default.nix b/pkgs/by-name/re/reaction/plugins/default.nix
index c6a7fa124699..37be39a9bd2d 100644
--- a/pkgs/by-name/re/reaction/plugins/default.nix
+++ b/pkgs/by-name/re/reaction/plugins/default.nix
@@ -12,7 +12,12 @@
     rustPlatform.buildRustPackage (
       {
         pname = name;
-        inherit (reaction) version src cargoHash;
+        inherit (reaction)
+          version
+          src
+          patches
+          cargoHash
+          ;
         buildAndTestSubdir = "plugins/${name}";
 
         meta = {