haskal
/
dragnpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

migrate zfs patch to 2.3

This commit is contained in:
xenia 2025-05-29 14:44:10 -04:00
parent fa2faaa61b
commit ba07a66e07
3 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
flake.lock
View File

@ -30,11 +30,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1747542820, "lastModified": 1748370509,
"narHash": "sha256-GaOZntlJ6gPPbbkTLjbd8BMWaDYafhuuYRNrxCGnPJw=", "narHash": "sha256-QlL8slIgc16W5UaI3w7xHQEP+Qmv/6vSNTpoZrrSlbk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "292fa7d4f6519c074f0a50394dbbe69859bb6043", "rev": "4faa5f5321320e49a78ae7848582f684d64783e9",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
overlay.nix
View File

@ -51,7 +51,7 @@ final: prev: {
lix-plugins = prev.callPackage ./pkgs/lix/lix-plugins {}; lix-plugins = prev.callPackage ./pkgs/lix/lix-plugins {};
nix-plugins = builtins.throw "nix-plugins is not supported. see pkgs.lix-plugins"; nix-plugins = builtins.throw "nix-plugins is not supported. see pkgs.lix-plugins";
zfs_2_2 = prev.zfs_2_2.overrideAttrs { zfs_2_3 = prev.zfs_2_3.overrideAttrs {
patches = [ ./pkgs/zfs/0001-ZED-add-support-for-desktop-notifications-D-Bus.patch ]; patches = [ ./pkgs/zfs/0001-ZED-add-support-for-desktop-notifications-D-Bus.patch ];
}; };

25
pkgs/zfs/0001-ZED-add-support-for-desktop-notifications-D-Bus.patch
View File

@ -1,18 +1,18 @@
From 4ec38cf16ad4cc5f7bb00b93c32cd8f1d313c14c Mon Sep 17 00:00:00 2001 From bf7fcd7f1213b4690dc95453117c55e12e5fa523 Mon Sep 17 00:00:00 2001
From: xenia <xenia@awoo.systems> From: xenia <xenia@awoo.systems>
Date: Mon, 3 Feb 2025 21:36:29 -0500 Date: Mon, 3 Feb 2025 21:36:29 -0500
Subject: [PATCH] ZED: add support for desktop notifications (D-Bus) Subject: [PATCH] ZED: add support for desktop notifications (D-Bus)
--- ---
cmd/zed/zed.d/zed-functions.sh | 85 ++++++++++++++++++++++++++++++++++ cmd/zed/zed.d/zed-functions.sh | 85 ++++++++++++++++++++++++++++++++++
cmd/zed/zed.d/zed.rc | 7 +++ cmd/zed/zed.d/zed.rc | 8 ++++
2 files changed, 92 insertions(+) 2 files changed, 93 insertions(+)
diff --git a/cmd/zed/zed.d/zed-functions.sh b/cmd/zed/zed.d/zed-functions.sh diff --git a/cmd/zed/zed.d/zed-functions.sh b/cmd/zed/zed.d/zed-functions.sh
index 3a2519633..d47ef070b 100644 index 6e00f153b..472941d10 100644
--- a/cmd/zed/zed.d/zed-functions.sh --- a/cmd/zed/zed.d/zed-functions.sh
+++ b/cmd/zed/zed.d/zed-functions.sh +++ b/cmd/zed/zed.d/zed-functions.sh
@@ -209,6 +209,10 @@ zed_notify() @@ -213,6 +213,10 @@ zed_notify()
[ "${rv}" -eq 0 ] && num_success=$((num_success + 1)) [ "${rv}" -eq 0 ] && num_success=$((num_success + 1))
[ "${rv}" -eq 1 ] && num_failure=$((num_failure + 1)) [ "${rv}" -eq 1 ] && num_failure=$((num_failure + 1))
@ -23,7 +23,7 @@ index 3a2519633..d47ef070b 100644
[ "${num_success}" -gt 0 ] && return 0 [ "${num_success}" -gt 0 ] && return 0
[ "${num_failure}" -gt 0 ] && return 1 [ "${num_failure}" -gt 0 ] && return 1
return 2 return 2
@@ -624,6 +628,87 @@ zed_notify_ntfy() @@ -724,6 +728,87 @@ zed_notify_gotify()
} }
@ -112,13 +112,14 @@ index 3a2519633..d47ef070b 100644
# zed_rate_limit (tag, [interval]) # zed_rate_limit (tag, [interval])
# #
diff --git a/cmd/zed/zed.d/zed.rc b/cmd/zed/zed.d/zed.rc diff --git a/cmd/zed/zed.d/zed.rc b/cmd/zed/zed.d/zed.rc
index 859c6f9cb..567cd556a 100644 index af56147a9..7917552c5 100644
--- a/cmd/zed/zed.d/zed.rc --- a/cmd/zed/zed.d/zed.rc
+++ b/cmd/zed/zed.d/zed.rc +++ b/cmd/zed/zed.d/zed.rc
@@ -176,3 +176,10 @@ ZED_SYSLOG_SUBCLASS_EXCLUDE="history_event" @@ -197,3 +197,11 @@ ZED_SYSLOG_SUBCLASS_EXCLUDE="history_event"
# <https://docs.ntfy.sh/install/> # Gotify application associated with ZED_GOTIFY_APPTOKEN.
# https://ntfy.sh by default; uncomment to enable an alternative service url. # Value is an integer 0 and up.
#ZED_NTFY_URL="https://ntfy.sh" #ZED_GOTIFY_PRIORITY=""
+
+ +
+## +##
+# Whether to send desktop notifications via D-Bus +# Whether to send desktop notifications via D-Bus
@ -127,5 +128,5 @@ index 859c6f9cb..567cd556a 100644
+# Disabled by default; uncomment to enable. +# Disabled by default; uncomment to enable.
+#ZED_USE_DBUS=1 +#ZED_USE_DBUS=1
-- --
2.47.0 2.47.2