From 56d096ed9fccd5efd22059c395126ca36aa25c50 Mon Sep 17 00:00:00 2001 From: phanirithvij Date: Tue, 2 Jun 2026 07:14:23 +0530 Subject: [PATCH] reaction: 2.4.0 -> 2.4.1 Signed-off-by: phanirithvij --- .../nftables-aarch64-linux-compat.patch | 33 ------------------- pkgs/by-name/re/reaction/package.nix | 12 ++----- 2 files changed, 3 insertions(+), 42 deletions(-) delete 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 deleted file mode 100644 index bd25eb2122a4..000000000000 --- a/pkgs/by-name/re/reaction/nftables-aarch64-linux-compat.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 94fafae651077be5e7a6dfd29fc06327a2f218ed Mon Sep 17 00:00:00 2001 -From: ppom -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>, - } - --fn to_rust_string(c_ptr: *const i8) -> Option { -+fn to_rust_string(c_ptr: *const c_char) -> Option { - 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 4515bdc356dc..63a9af69be40 100644 --- a/pkgs/by-name/re/reaction/package.nix +++ b/pkgs/by-name/re/reaction/package.nix @@ -4,7 +4,6 @@ callPackage, rustPlatform, fetchFromGitLab, - fetchpatch, versionCheckHook, installShellFiles, @@ -14,22 +13,17 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "reaction"; - version = "2.4.0"; + version = "2.4.1"; src = fetchFromGitLab { domain = "framagit.org"; owner = "ppom"; repo = "reaction"; tag = "v${finalAttrs.version}"; - hash = "sha256-Y6scgbcwhg56SQ1DefNtdja+n89Gc5bJUHKHKn2EYwQ="; + hash = "sha256-1+kliU3TfXhAz/vRh/UamTdcv8UIXrcF1q+Qy1jsjD4="; }; - patches = [ - # nftables: fix compilation on aarch64-linux; remove in 2.4.1 - ./nftables-aarch64-linux-compat.patch - ]; - - cargoHash = "sha256-NAcMpASvphAqjBjbAPWLG5qZbSgdaFC3GvU25exCS3g="; + cargoHash = "sha256-FQCYCSKk8SLO2ddM6hklUuTvSK7+4dElaNQ3ZNnci3M="; nativeBuildInputs = [ installShellFiles ];