From ab320c9bcd307cffd6dd8b831e7d4faef47851fa Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Wed, 28 May 2025 18:19:16 -0700 Subject: [PATCH] nixos/octoprint: fix setting host causing port to be unset This was because of the non-recursive update of the attrset. --- nixos/modules/services/misc/octoprint.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/misc/octoprint.nix b/nixos/modules/services/misc/octoprint.nix index 45c631a36dfd..0343b2376d21 100644 --- a/nixos/modules/services/misc/octoprint.nix +++ b/nixos/modules/services/misc/octoprint.nix @@ -8,11 +8,11 @@ let cfg = config.services.octoprint; - baseConfig = { + baseConfig = lib.recursiveUpdate { plugins.curalegacy.cura_engine = "${pkgs.curaengine_stable}/bin/CuraEngine"; server.port = cfg.port; webcam.ffmpeg = "${pkgs.ffmpeg.bin}/bin/ffmpeg"; - } // lib.optionalAttrs (cfg.host != null) { server.host = cfg.host; }; + } (lib.optionalAttrs (cfg.host != null) { server.host = cfg.host; }); fullConfig = lib.recursiveUpdate cfg.extraConfig baseConfig;