Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

Merge pull request #251597 from wietsedv/calibre-web

nixos/calibre-web: add package and enableKepubify options

authored by Yorick and committed by GitHub 829514e2 69ecad6a

+7 -1
+6 -1
nixos/modules/services/web-apps/calibre-web.nix
··· 10 services.calibre-web = { 11 enable = mkEnableOption (lib.mdDoc "Calibre-Web"); 12 13 listen = { 14 ip = mkOption { 15 type = types.str; ··· 73 ''; 74 }; 75 76 enableBookUploading = mkOption { 77 type = types.bool; 78 default = false; ··· 106 systemd.services.calibre-web = let 107 appDb = "/var/lib/${cfg.dataDir}/app.db"; 108 gdriveDb = "/var/lib/${cfg.dataDir}/gdrive.db"; 109 - calibreWebCmd = "${pkgs.calibre-web}/bin/calibre-web -p ${appDb} -g ${gdriveDb}"; 110 111 settings = concatStringsSep ", " ( 112 [ ··· 117 ] 118 ++ optional (cfg.options.calibreLibrary != null) "config_calibre_dir = '${cfg.options.calibreLibrary}'" 119 ++ optional cfg.options.enableBookConversion "config_converterpath = '${pkgs.calibre}/bin/ebook-convert'" 120 ); 121 in 122 {
··· 10 services.calibre-web = { 11 enable = mkEnableOption (lib.mdDoc "Calibre-Web"); 12 13 + package = lib.mkPackageOption pkgs "calibre-web" { }; 14 + 15 listen = { 16 ip = mkOption { 17 type = types.str; ··· 75 ''; 76 }; 77 78 + enableKepubify = mkEnableOption (lib.mdDoc "kebup conversion support"); 79 + 80 enableBookUploading = mkOption { 81 type = types.bool; 82 default = false; ··· 110 systemd.services.calibre-web = let 111 appDb = "/var/lib/${cfg.dataDir}/app.db"; 112 gdriveDb = "/var/lib/${cfg.dataDir}/gdrive.db"; 113 + calibreWebCmd = "${cfg.package}/bin/calibre-web -p ${appDb} -g ${gdriveDb}"; 114 115 settings = concatStringsSep ", " ( 116 [ ··· 121 ] 122 ++ optional (cfg.options.calibreLibrary != null) "config_calibre_dir = '${cfg.options.calibreLibrary}'" 123 ++ optional cfg.options.enableBookConversion "config_converterpath = '${pkgs.calibre}/bin/ebook-convert'" 124 + ++ optional cfg.options.enableKepubify "config_kepubifypath = '${pkgs.kepubify}/bin/kepubify'" 125 ); 126 in 127 {
+1
pkgs/servers/calibre-web/default.nix
··· 44 flask-wtf 45 flask-limiter 46 iso-639 47 lxml 48 pypdf 49 requests
··· 44 flask-wtf 45 flask-limiter 46 iso-639 47 + jsonschema 48 lxml 49 pypdf 50 requests