From 3487e7743fe3ec8341ec4d5923c4e864f2db76d0 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Wed, 15 Oct 2025 03:09:05 +0900 Subject: [PATCH] nixos/tor: fix nix expression for `BindPaths` `BindPaths` would earlier fail to eval under certain configurations due to a lack of null checking --- nixos/modules/services/security/tor.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix index 219458870472..92410e28a1ed 100644 --- a/nixos/modules/services/security/tor.nix +++ b/nixos/modules/services/security/tor.nix @@ -1413,9 +1413,13 @@ in BindPaths = [ stateDir ] - ++ lib.catAttrs "unix" ( - lib.catAttrs "target" ( - lib.concatMap (onionService: onionService.map) (lib.attrValues cfg.relay.onionServices) + ++ lib.filter (x: x != null) ( + lib.catAttrs "unix" ( + lib.filter (x: x != null) ( + lib.catAttrs "target" ( + lib.concatMap (onionService: onionService.map) (lib.attrValues cfg.relay.onionServices) + ) + ) ) ); BindReadOnlyPaths = [