diff options
author | Yorick <yorick@yorickvanpelt.nl> | 2023-09-20 22:35:16 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-09-20 22:35:16 +0200 |
commit | 829514e2da892da804b9526094b6530f1b124d8a (patch) | |
tree | c2e22fc78da99951d6e4efcea7d22c61b3ab7c62 | |
parent | 69ecad6acbef29514ddeed18a6f8316d8b0c2021 (diff) | |
parent | 2c622185a7f9d81ae92490d881c46b26e9f94e58 (diff) | |
download | nixpkgs-829514e2da892da804b9526094b6530f1b124d8a.tar nixpkgs-829514e2da892da804b9526094b6530f1b124d8a.tar.gz nixpkgs-829514e2da892da804b9526094b6530f1b124d8a.tar.bz2 nixpkgs-829514e2da892da804b9526094b6530f1b124d8a.tar.lz nixpkgs-829514e2da892da804b9526094b6530f1b124d8a.tar.xz nixpkgs-829514e2da892da804b9526094b6530f1b124d8a.tar.zst nixpkgs-829514e2da892da804b9526094b6530f1b124d8a.zip |
Merge pull request #251597 from wietsedv/calibre-web
nixos/calibre-web: add package and enableKepubify options
-rw-r--r-- | nixos/modules/services/web-apps/calibre-web.nix | 7 | ||||
-rw-r--r-- | pkgs/servers/calibre-web/default.nix | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/nixos/modules/services/web-apps/calibre-web.nix b/nixos/modules/services/web-apps/calibre-web.nix index 143decfc091..80567db10c9 100644 --- a/nixos/modules/services/web-apps/calibre-web.nix +++ b/nixos/modules/services/web-apps/calibre-web.nix @@ -10,6 +10,8 @@ in services.calibre-web = { enable = mkEnableOption (lib.mdDoc "Calibre-Web"); + package = lib.mkPackageOption pkgs "calibre-web" { }; + listen = { ip = mkOption { type = types.str; @@ -73,6 +75,8 @@ in ''; }; + enableKepubify = mkEnableOption (lib.mdDoc "kebup conversion support"); + enableBookUploading = mkOption { type = types.bool; default = false; @@ -106,7 +110,7 @@ in systemd.services.calibre-web = let appDb = "/var/lib/${cfg.dataDir}/app.db"; gdriveDb = "/var/lib/${cfg.dataDir}/gdrive.db"; - calibreWebCmd = "${pkgs.calibre-web}/bin/calibre-web -p ${appDb} -g ${gdriveDb}"; + calibreWebCmd = "${cfg.package}/bin/calibre-web -p ${appDb} -g ${gdriveDb}"; settings = concatStringsSep ", " ( [ @@ -117,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.enableKepubify "config_kepubifypath = '${pkgs.kepubify}/bin/kepubify'" ); in { diff --git a/pkgs/servers/calibre-web/default.nix b/pkgs/servers/calibre-web/default.nix index 70f2287c83e..f59ebb6fe20 100644 --- a/pkgs/servers/calibre-web/default.nix +++ b/pkgs/servers/calibre-web/default.nix @@ -44,6 +44,7 @@ python.pkgs.buildPythonApplication rec { flask-wtf flask-limiter iso-639 + jsonschema lxml pypdf requests |