From eb6cee5bc1c3344547f45dc4a2a5496c2ab636d1 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 1 Feb 2026 11:54:43 +0200 Subject: [PATCH 1/2] nixos/mpd: allow setting null nonBlockSettings --- nixos/modules/services/audio/mpd.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/audio/mpd.nix b/nixos/modules/services/audio/mpd.nix index 909f78d9a04e..fa19da5a2e86 100644 --- a/nixos/modules/services/audio/mpd.nix +++ b/nixos/modules/services/audio/mpd.nix @@ -26,7 +26,9 @@ let "\"" + (toString v) + "\"" ) ) a; - nonBlockSettings = lib.filterAttrs (n: v: !(builtins.isAttrs v || builtins.isList v)) cfg.settings; + nonBlockSettings = lib.filterAttrs ( + n: v: !(builtins.isAttrs v || builtins.isList v || isNull v) + ) cfg.settings; pureBlockSettings = removeAttrs cfg.settings (builtins.attrNames nonBlockSettings); blocks = pureBlockSettings From 64c3b8942b9f1b97772391f9248a3de5ba3fa596 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 1 Feb 2026 11:55:06 +0200 Subject: [PATCH 2/2] nixos/mpd: allow setting null db_file Fixes #485726 . --- nixos/modules/services/audio/mpd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/audio/mpd.nix b/nixos/modules/services/audio/mpd.nix index fa19da5a2e86..1801bdc989d8 100644 --- a/nixos/modules/services/audio/mpd.nix +++ b/nixos/modules/services/audio/mpd.nix @@ -223,7 +223,7 @@ in }; db_file = lib.mkOption { - type = lib.types.path; + type = lib.types.nullOr lib.types.path; default = "${cfg.dataDir}/tag_cache"; defaultText = lib.literalExpression ''"''${dataDir}/tag_cache"''; description = ''