ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-15 13:37:21 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #195119 from anthonyroussel/calibre-web_0_6_19

Browse Source 
calibre-web: 0.6.18 -> 0.6.19
This commit is contained in:
Bobby Rong 2022-10-17 22:07:50 +08:00 committed by GitHub
commit 8eec1cf7ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/servers/calibre-web/db-migrations.patch
View File

@ -1,14 +1,14 @@
diff --git a/cps/__init__.py b/cps/__init__.py
index 627cca0b..233bb2dd 100644
index 1ba1f778..fd5dc2f1 100644
--- a/cps/__init__.py
+++ b/cps/__init__.py
@@ -87,6 +87,9 @@ db.CalibreDB.setup_db(config, cli.settingspath)
calibre_db = db.CalibreDB()
@@ -116,6 +116,9 @@ def create_app():
db.CalibreDB.setup_db(config.config_calibre_dir, cli_param.settings_path)
calibre_db.init_db()
+ if os.environ.get('__RUN_MIGRATIONS_AND_EXIT'):
+ sys.exit(0)
+
def create_app():
app.wsgi_app = ReverseProxied(app.wsgi_app)
# For python2 convert path to unicode
updater_thread.init_updater(config, web_server)
# Perform dry run of updater and exit afterwards
if cli_param.dry_run:

7
pkgs/servers/calibre-web/default.nix
View File

@ -6,16 +6,17 @@
python3.pkgs.buildPythonApplication rec {
pname = "calibre-web";
version = "0.6.18";
version = "0.6.19";
src = fetchFromGitHub {
owner = "janeczku";
repo = "calibre-web";
rev = version;
sha256 = "sha256-KjmpFetNhNM5tL34e/Pn1i3hc86JZglubSMsHZWu198=";
hash = "sha256-mNYLQ+3u6xRaoZ5oH6HdylFfgz1fq1ZB86AWk9vULWQ=";
};
propagatedBuildInputs = with python3.pkgs; [
APScheduler
advocate
backports_abc
chardet
@ -57,7 +58,7 @@ python3.pkgs.buildPythonApplication rec {
--replace "cps = calibreweb:main" "calibre-web = calibreweb:main" \
--replace "chardet>=3.0.0,<4.1.0" "chardet>=3.0.0,<6" \
--replace "Flask>=1.0.2,<2.1.0" "Flask>=1.0.2" \
--replace "Flask-Login>=0.3.2,<0.5.1" "Flask-Login>=0.3.2" \
--replace "Flask-Login>=0.3.2,<0.6.2" "Flask-Login>=0.3.2" \
--replace "flask-wtf>=0.14.2,<1.1.0" "flask-wtf>=0.14.2" \
--replace "lxml>=3.8.0,<4.9.0" "lxml>=3.8.0" \
--replace "tornado>=4.1,<6.2" "tornado>=4.1,<7" \