diff options
| author | Anthony Roussel <anthony@roussel.dev> | 2022-10-15 13:25:26 +0200 |
|---|---|---|
| committer | Anthony Roussel <anthony@roussel.dev> | 2022-10-15 13:25:26 +0200 |
| commit | 53a5e17993ff53c33a6d3ad3ef8ac515515eb49d (patch) | |
| tree | 982cf583ba3d37499f2aab8fe4cd4a2d180e69ce /pkgs/servers/calibre-web | |
| parent | 1a615dc4ac20953d9f98e5e7101fe00bc71e9dae (diff) | |
calibre-web: 0.6.18 -> 0.6.19
Diffstat (limited to 'pkgs/servers/calibre-web')
| -rw-r--r-- | pkgs/servers/calibre-web/db-migrations.patch | 20 | ||||
| -rw-r--r-- | pkgs/servers/calibre-web/default.nix | 7 |
2 files changed, 14 insertions, 13 deletions
diff --git a/pkgs/servers/calibre-web/db-migrations.patch b/pkgs/servers/calibre-web/db-migrations.patch index 87e63f7d95c2b..2e865db68da3f 100644 --- a/pkgs/servers/calibre-web/db-migrations.patch +++ b/pkgs/servers/calibre-web/db-migrations.patch @@ -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() - -+if os.environ.get('__RUN_MIGRATIONS_AND_EXIT'): -+ sys.exit(0) +@@ -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: diff --git a/pkgs/servers/calibre-web/default.nix b/pkgs/servers/calibre-web/default.nix index 1505f6894a650..91a5e4fdd1c51 100644 --- a/pkgs/servers/calibre-web/default.nix +++ b/pkgs/servers/calibre-web/default.nix @@ -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" \ |