From 1d3bc272bc31389c06ae1670d7577cab760ffd25 Mon Sep 17 00:00:00 2001
From: Adam Stephens <adam@valkor.net>
Date: Tue, 24 Oct 2023 08:09:37 -0400
Subject: [PATCH] calibre-web: 0.6.20 -> 0.6.21

---
 pkgs/servers/calibre-web/default.nix          |  6 ++---
 pkgs/servers/calibre-web/static_environ.patch | 25 -------------------
 2 files changed, 2 insertions(+), 29 deletions(-)
 delete mode 100644 pkgs/servers/calibre-web/static_environ.patch

diff --git a/pkgs/servers/calibre-web/default.nix b/pkgs/servers/calibre-web/default.nix
index f59ebb6fe20f..160435802957 100644
--- a/pkgs/servers/calibre-web/default.nix
+++ b/pkgs/servers/calibre-web/default.nix
@@ -25,13 +25,13 @@ let
 in
 python.pkgs.buildPythonApplication rec {
   pname = "calibre-web";
-  version = "0.6.20";
+  version = "0.6.21";
 
   src = fetchFromGitHub {
     owner = "janeczku";
     repo = "calibre-web";
     rev = version;
-    hash = "sha256-0lArY1aTpO4sgIVDSqClYMGlip92f9hE/L2UouTLK8Q=";
+    hash = "sha256-tRrOquetn3P2NmrXq7DQHRGP1sWnLR7bV2Lw0W/lUPQ=";
   };
 
   propagatedBuildInputs = with python.pkgs; [
@@ -64,8 +64,6 @@ python.pkgs.buildPythonApplication rec {
     # and exit. This is gonna be used to configure calibre-web declaratively, as most of its configuration parameters
     # are stored in the DB.
     ./db-migrations.patch
-    # environ in tornado.wsgi.WSGIContainer no longer a static method from 6.3 version
-    ./static_environ.patch
   ];
 
   # calibre-web doesn't follow setuptools directory structure. The following is taken from the script
diff --git a/pkgs/servers/calibre-web/static_environ.patch b/pkgs/servers/calibre-web/static_environ.patch
deleted file mode 100644
index 4f94283a4e66..000000000000
--- a/pkgs/servers/calibre-web/static_environ.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/cps/tornado_wsgi.py b/cps/tornado_wsgi.py
-index af93219c..cf302042 100644
---- a/cps/tornado_wsgi.py
-+++ b/cps/tornado_wsgi.py
-@@ -53,7 +53,7 @@ class MyWSGIContainer(WSGIContainer):
-             return response.append
- 
-         app_response = self.wsgi_application(
--            MyWSGIContainer.environ(request), start_response
-+            self.environ(request), start_response
-         )
-         try:
-             response.extend(app_response)
-@@ -86,9 +86,8 @@ class MyWSGIContainer(WSGIContainer):
-         request.connection.finish()
-         self._log(status_code, request)
- 
--    @staticmethod
--    def environ(request: httputil.HTTPServerRequest) -> Dict[Text, Any]:
--        environ = WSGIContainer.environ(request)
-+    def environ(self, request: httputil.HTTPServerRequest) -> Dict[Text, Any]:
-+        environ = super().environ(request)
-         environ['RAW_URI'] = request.path
-         return environ
-