flake.lock

@@ -362,14 +362,14 @@
     "nextcloud-snappymail": {
       "flake": false,
       "locked": {
-        "lastModified": 1724017617,
+        "lastModified": 1723347706,
-        "narHash": "sha256-WwCRAZzxYWUpOy6iVTDpVIr/DrkJkQGjgIdVWNfCH3Q=",
+        "narHash": "sha256-HlqO7xlMSRGgBtwi0t5oz5v7iw0zTSHysc9wGVRwGZI=",
         "type": "tarball",
-        "url": "https://snappymail.eu/repository/nextcloud/snappymail-2.37.2-nextcloud.tar.gz"
+        "url": "https://snappymail.eu/repository/nextcloud/snappymail-2.36.4-nextcloud.tar.gz"
       },
       "original": {
         "type": "tarball",
-        "url": "https://snappymail.eu/repository/nextcloud/snappymail-2.37.2-nextcloud.tar.gz"
+        "url": "https://snappymail.eu/repository/nextcloud/snappymail-2.36.4-nextcloud.tar.gz"
       }
     },
     "nix2vim": {

flake.nix

@@ -211,7 +211,7 @@
     nextcloud-snappymail = {
       # https://github.com/the-djmaze/snappymail/releases
       # https://snappymail.eu/repository/nextcloud
-      url = "https://snappymail.eu/repository/nextcloud/snappymail-2.37.2-nextcloud.tar.gz";
+      url = "https://snappymail.eu/repository/nextcloud/snappymail-2.36.4-nextcloud.tar.gz";
       # url = "https://github.com/nmasur/snappymail-nextcloud/releases/download/v2.36.3/snappymail-2.36.3-nextcloud.tar.gz";
       flake = false;
     };
@@ -259,6 +259,7 @@
         inputs.nur.overlay
         inputs.nix2vim.overlay
         (import ./overlays/neovim-plugins.nix inputs)
+        (import ./overlays/calibre-web.nix)
         (import ./overlays/disko.nix inputs)
         (import ./overlays/tree-sitter.nix inputs)
         (import ./overlays/mpv-scripts.nix inputs)

overlays/calibre-web-cloudflare.patch

@@ -0,0 +1,27 @@
+diff --git a/cps/__init__.py b/cps/__init__.py
+index f4f8dbf2..7377acdf 100644
+--- a/cps/__init__.py
++++ b/cps/__init__.py
+@@ -151,7 +151,6 @@ def create_app():
+ 
+     lm.login_view = 'web.login'
+     lm.anonymous_user = ub.Anonymous
+-    lm.session_protection = 'strong' if config.config_session == 1 else "basic"
+ 
+     db.CalibreDB.update_config(config)
+     db.CalibreDB.setup_db(config.config_calibre_dir, cli_param.settings_path)
+diff --git a/cps/admin.py b/cps/admin.py
+index 045a9523..825a28af 100644
+--- a/cps/admin.py
++++ b/cps/admin.py
+@@ -102,10 +102,6 @@ def admin_required(f):
+ 
+ @admi.before_app_request
+ def before_request():
+-    if not ub.check_user_session(current_user.id,
+-                                 flask_session.get('_id')) and 'opds' not in request.path \
+-      and config.config_session == 1:
+-        logout_user()
+     g.constants = constants
+     g.google_site_verification = os.getenv('GOOGLE_SITE_VERIFICATION', '')
+     g.allow_registration = config.config_public_reg

overlays/calibre-web.nix

@@ -0,0 +1,7 @@
+# Fix: https://github.com/janeczku/calibre-web/issues/2422
+
+_final: prev: {
+  calibre-web = prev.calibre-web.overrideAttrs (old: {
+    patches = (old.patches or [ ]) ++ [ ./calibre-web-cloudflare.patch ];
+  });
+}

overlays/nextcloud-apps.nix

@@ -5,25 +5,21 @@ inputs: _final: prev: {
       url = inputs.nextcloud-news.outPath;
       sha256 = inputs.nextcloud-news.narHash;
       license = "agpl3Plus";
-      unpack = true;
     };
     external = prev.fetchNextcloudApp {
       url = inputs.nextcloud-external.outPath;
       sha256 = inputs.nextcloud-external.narHash;
       license = "agpl3Plus";
-      unpack = true;
     };
     cookbook = prev.fetchNextcloudApp {
       url = inputs.nextcloud-cookbook.outPath;
       sha256 = inputs.nextcloud-cookbook.narHash;
       license = "agpl3Plus";
-      unpack = true;
     };
     snappymail = prev.fetchNextcloudApp {
       url = inputs.nextcloud-snappymail.outPath;
       sha256 = inputs.nextcloud-snappymail.narHash;
       license = "agpl3Plus";
-      unpack = true;
     };
   };
 }