mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-06 17:13:24 -05:00
reaction: 2.4.0 -> 2.4.1
Signed-off-by: phanirithvij <phanirithvij2000@gmail.com>
This commit is contained in:
parent
4df1b885d7
commit
56d096ed9f
2 changed files with 3 additions and 42 deletions
|
|
@ -1,33 +0,0 @@
|
|||
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
|
||||
|
||||
|
||||
|
|
@ -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 ];
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue