pyrox.dev
calibre-web: 0.6.20 -> 0.6.21
+2
-4
pkgs/servers/calibre-web/default.nix
+2
-4
pkgs/servers/calibre-web/default.nix
···
25
25
in
26
26
python.pkgs.buildPythonApplication rec {
27
27
pname = "calibre-web";
28
-
version = "0.6.20";
28
+
version = "0.6.21";
29
29
30
30
src = fetchFromGitHub {
31
31
owner = "janeczku";
32
32
repo = "calibre-web";
33
33
rev = version;
34
-
hash = "sha256-0lArY1aTpO4sgIVDSqClYMGlip92f9hE/L2UouTLK8Q=";
34
+
hash = "sha256-tRrOquetn3P2NmrXq7DQHRGP1sWnLR7bV2Lw0W/lUPQ=";
35
35
};
36
36
37
37
propagatedBuildInputs = with python.pkgs; [
···
64
64
# and exit. This is gonna be used to configure calibre-web declaratively, as most of its configuration parameters
65
65
# are stored in the DB.
66
66
./db-migrations.patch
67
-
# environ in tornado.wsgi.WSGIContainer no longer a static method from 6.3 version
68
-
./static_environ.patch
69
67
];
70
68
71
69
# calibre-web doesn't follow setuptools directory structure. The following is taken from the script
-25
pkgs/servers/calibre-web/static_environ.patch
-25
pkgs/servers/calibre-web/static_environ.patch
···
1
-
diff --git a/cps/tornado_wsgi.py b/cps/tornado_wsgi.py
2
-
index af93219c..cf302042 100644
3
-
--- a/cps/tornado_wsgi.py
4
-
+++ b/cps/tornado_wsgi.py
5
-
@@ -53,7 +53,7 @@ class MyWSGIContainer(WSGIContainer):
6
-
return response.append
7
-
8
-
app_response = self.wsgi_application(
9
-
- MyWSGIContainer.environ(request), start_response
10
-
+ self.environ(request), start_response
11
-
)
12
-
try:
13
-
response.extend(app_response)
14
-
@@ -86,9 +86,8 @@ class MyWSGIContainer(WSGIContainer):
15
-
request.connection.finish()
16
-
self._log(status_code, request)
17
-
18
-
- @staticmethod
19
-
- def environ(request: httputil.HTTPServerRequest) -> Dict[Text, Any]:
20
-
- environ = WSGIContainer.environ(request)
21
-
+ def environ(self, request: httputil.HTTPServerRequest) -> Dict[Text, Any]:
22
-
+ environ = super().environ(request)
23
-
environ['RAW_URI'] = request.path
24
-
return environ
25
-