From 51dc1633648e18eb4d094a6bcec7d00cfbff3ecd Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Sat, 29 Mar 2025 07:39:04 +0530 Subject: [PATCH] nixos/ananicy: re enable BPF on hardened kernels This was a workaround to begin with, as hardened kernel didn't support tracing. Back then kernel level tracing was only available through debugfs, and now that tracefs has been available on NixOS for a while now, enabled in Link: https://github.com/NixOS/nixpkgs/pull/388751 This workaround can be removed and bpf can be used with tracefs. Link: https://github.com/NixOS/nixpkgs/issues/360957 Signed-off-by: John Titor <50095635+JohnRTitor@users.noreply.github.com> --- nixos/modules/services/misc/ananicy.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/nixos/modules/services/misc/ananicy.nix b/nixos/modules/services/misc/ananicy.nix index bb3e63e2134a..38f16d99bb4b 100644 --- a/nixos/modules/services/misc/ananicy.nix +++ b/nixos/modules/services/misc/ananicy.nix @@ -19,12 +19,6 @@ let ); servicename = if ((lib.getName cfg.package) == (lib.getName pkgs.ananicy-cpp)) then "ananicy-cpp" else "ananicy"; - # Ananicy-CPP with BPF is not supported on hardened kernels https://github.com/NixOS/nixpkgs/issues/327382 - finalPackage = - if (servicename == "ananicy-cpp" && config.boot.kernelPackages.isHardened) then - (cfg.package.override { withBpf = false; }) - else - cfg.package; in { options.services.ananicy = { @@ -113,7 +107,7 @@ in config = lib.mkIf cfg.enable { environment = { - systemPackages = [ finalPackage ]; + systemPackages = [ cfg.package ]; etc."ananicy.d".source = pkgs.runCommand "ananicyfiles" { @@ -170,7 +164,7 @@ in ); systemd = { - packages = [ finalPackage ]; + packages = [ cfg.package ]; services."${servicename}" = { wantedBy = [ "default.target" ]; };