From 8d680a8c59f9ba3bc73d533862b06b9121068511 Mon Sep 17 00:00:00 2001 From: Mathieu Fenniak Date: Thu, 19 Dec 2024 14:38:32 -0700 Subject: [PATCH 1/2] calibre-web: fix ebook conversion missing config_binariesdir setting --- nixos/modules/services/web-apps/calibre-web.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/web-apps/calibre-web.nix b/nixos/modules/services/web-apps/calibre-web.nix index 0ca9ed2fbcf3..646ef6afd8c0 100644 --- a/nixos/modules/services/web-apps/calibre-web.nix +++ b/nixos/modules/services/web-apps/calibre-web.nix @@ -121,6 +121,7 @@ in ] ++ optional (cfg.options.calibreLibrary != null) "config_calibre_dir = '${cfg.options.calibreLibrary}'" ++ optional cfg.options.enableBookConversion "config_converterpath = '${pkgs.calibre}/bin/ebook-convert'" + ++ optional cfg.options.enableBookConversion "config_binariesdir = '${pkgs.calibre}/bin/'" ++ optional cfg.options.enableKepubify "config_kepubifypath = '${pkgs.kepubify}/bin/kepubify'" ); in From 801eacddccaa6e016ff9285add97844c6a8ff8eb Mon Sep 17 00:00:00 2001 From: Mathieu Fenniak Date: Sun, 9 Mar 2025 12:42:27 -0600 Subject: [PATCH 2/2] replace multiple optional w/ one optionals import optionals --- nixos/modules/services/web-apps/calibre-web.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/web-apps/calibre-web.nix b/nixos/modules/services/web-apps/calibre-web.nix index 646ef6afd8c0..9b62d515b0e7 100644 --- a/nixos/modules/services/web-apps/calibre-web.nix +++ b/nixos/modules/services/web-apps/calibre-web.nix @@ -3,7 +3,7 @@ let cfg = config.services.calibre-web; - inherit (lib) concatStringsSep mkEnableOption mkIf mkOption optional optionalString types; + inherit (lib) concatStringsSep mkEnableOption mkIf mkOption optional optionals optionalString types; in { options = { @@ -120,8 +120,10 @@ in "config_reverse_proxy_login_header_name = '${cfg.options.reverseProxyAuth.header}'" ] ++ optional (cfg.options.calibreLibrary != null) "config_calibre_dir = '${cfg.options.calibreLibrary}'" - ++ optional cfg.options.enableBookConversion "config_converterpath = '${pkgs.calibre}/bin/ebook-convert'" - ++ optional cfg.options.enableBookConversion "config_binariesdir = '${pkgs.calibre}/bin/'" + ++ optionals cfg.options.enableBookConversion [ + "config_converterpath = '${pkgs.calibre}/bin/ebook-convert'" + "config_binariesdir = '${pkgs.calibre}/bin/'" + ] ++ optional cfg.options.enableKepubify "config_kepubifypath = '${pkgs.kepubify}/bin/kepubify'" ); in