summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPavel Borzenkov <pavel@borzenkov.net>2021-09-27 20:51:30 +0200
committerPavel Borzenkov <pavel@borzenkov.net>2021-09-27 20:51:30 +0200
commit80f7656229efee8817880250b2ca097a69898330 (patch)
tree442ccfe1421b6dc951e065fc958d4142b9816e1a
parentMerge pull request #139455 from dotlambda/mauikit-2.0.2 (diff)
downloadnixpkgs-80f7656229efee8817880250b2ca097a69898330.tar.gz
calibre-web: 0.6.12 -> 0.6.13
calibre-web no longer starts without proper calibre DB path configured, so the default testcase (completely unconfigured) is removed.
-rw-r--r--nixos/tests/calibre-web.nix10
-rw-r--r--pkgs/servers/calibre-web/default.nix5
2 files changed, 3 insertions, 12 deletions
diff --git a/nixos/tests/calibre-web.nix b/nixos/tests/calibre-web.nix
index 0af997317fcd..9832d5469787 100644
--- a/nixos/tests/calibre-web.nix
+++ b/nixos/tests/calibre-web.nix
@@ -11,10 +11,6 @@ import ./make-test-python.nix (
meta.maintainers = with pkgs.lib.maintainers; [ pborzenkov ];
nodes = {
- default = { ... }: {
- services.calibre-web.enable = true;
- };
-
customized = { pkgs, ... }: {
services.calibre-web = {
enable = true;
@@ -33,12 +29,6 @@ import ./make-test-python.nix (
testScript = ''
start_all()
- default.wait_for_unit("calibre-web.service")
- default.wait_for_open_port(${toString defaultPort})
- default.succeed(
- "curl --fail 'http://localhost:${toString defaultPort}/basicconfig' | grep 'Basic Configuration'"
- )
-
customized.succeed(
"mkdir /tmp/books && calibredb --library-path /tmp/books add -e --title test-book"
)
diff --git a/pkgs/servers/calibre-web/default.nix b/pkgs/servers/calibre-web/default.nix
index b6dd0b987201..6d88b6d45887 100644
--- a/pkgs/servers/calibre-web/default.nix
+++ b/pkgs/servers/calibre-web/default.nix
@@ -7,13 +7,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "calibre-web";
- version = "0.6.12";
+ version = "0.6.13";
src = fetchFromGitHub {
owner = "janeczku";
repo = "calibre-web";
rev = version;
- sha256 = "sha256-IgS281qDxG302UznC63nZH8/ty4fgFtn+lLYdakGA4w=";
+ sha256 = "sha256-zU7ujvFPi4UaaEglIK3YX3TJxBME35NEKKblnJRt0tM=";
};
prePatch = ''
@@ -52,6 +52,7 @@ python3.pkgs.buildPythonApplication rec {
flask_login
flask_principal
iso-639
+ lxml
pypdf3
requests
sqlalchemy