|
4 | 4 | callPackage, |
5 | 5 | lib, |
6 | 6 | fetchFromGitHub, |
7 | | - fetchPypi, |
8 | 7 | python3, |
9 | 8 | replaceVars, |
10 | 9 | nix-update-script, |
|
17 | 16 | py = python3.override { |
18 | 17 | self = py; |
19 | 18 | packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ([ |
20 | | - ( |
21 | | - # Due to flask > 2.3 the login will not work |
22 | | - self: super: { |
23 | | - werkzeug = super.werkzeug.overridePythonAttrs (oldAttrs: rec { |
24 | | - version = "2.2.3"; |
25 | | - format = "setuptools"; |
26 | | - pyproject = null; |
27 | | - src = fetchPypi { |
28 | | - pname = "Werkzeug"; |
29 | | - inherit version; |
30 | | - hash = "sha256-LhzMlBfU2jWLnebxdOOsCUOR6h1PvvLWZ4ZdgZ39Cv4="; |
31 | | - }; |
32 | | - doCheck = false; |
33 | | - }); |
34 | | - flask = super.flask.overridePythonAttrs (oldAttrs: rec { |
35 | | - version = "2.2.5"; |
36 | | - format = "setuptools"; |
37 | | - pyproject = null; |
38 | | - src = fetchPypi { |
39 | | - pname = "Flask"; |
40 | | - inherit version; |
41 | | - hash = "sha256-7e6bCn/yZiG9WowQ/0hK4oc3okENmbC7mmhQx/uXeqA="; |
42 | | - }; |
43 | | - doCheck = false; |
44 | | - }); |
45 | | - flask-login = super.flask-login.overridePythonAttrs (oldAttrs: rec { |
46 | | - version = "0.6.3"; |
47 | | - src = fetchPypi { |
48 | | - pname = "Flask-Login"; |
49 | | - inherit version; |
50 | | - hash = "sha256-XiPRSmB+8SgGxplZC4nQ8ODWe67sWZ11lHv5wUczAzM="; |
51 | | - }; |
52 | | - build-system = [ self.setuptools ]; |
53 | | - doCheck = false; # DeprecationWarnings |
54 | | - }); |
55 | | - pytest-httpbin = super.pytest-httpbin.overridePythonAttrs (oldAttrs: { |
56 | | - doCheck = false; # fails in current overlay |
57 | | - }); |
58 | | - httpcore = super.httpcore.overridePythonAttrs (oldAttrs: { |
59 | | - doCheck = false; # fails in current overlay |
60 | | - }); |
61 | | - |
62 | | - netaddr = super.netaddr.overridePythonAttrs (oldAttrs: rec { |
63 | | - version = "0.9.0"; |
64 | | - |
65 | | - src = fetchPypi { |
66 | | - pname = "netaddr"; |
67 | | - inherit version; |
68 | | - hash = "sha256-e0b6mxotcf1d6eSjeE7zOXAKU6CMgEDwi69fEZTaASg="; |
69 | | - }; |
70 | | - }); |
71 | | - }) |
72 | | - |
73 | 19 | # Built-in dependency |
74 | 20 | (self: super: { |
75 | 21 | octoprint-filecheck = self.buildPythonPackage rec { |
|
105 | 51 | (self: super: { |
106 | 52 | octoprint-pisupport = self.buildPythonPackage rec { |
107 | 53 | pname = "OctoPrint-PiSupport"; |
108 | | - version = "2023.5.24"; |
| 54 | + version = "2023.10.10"; |
109 | 55 | format = "setuptools"; |
110 | 56 |
|
111 | 57 | src = fetchFromGitHub { |
112 | 58 | owner = "OctoPrint"; |
113 | 59 | repo = "OctoPrint-PiSupport"; |
114 | 60 | rev = version; |
115 | | - hash = "sha256-KfkZXJ2f02G2ee+J1w+YQRKz+LSWwxVIIwmdevDGhew="; |
| 61 | + hash = "sha256-VSzDoFq4Yn6KOn+RNi1uVJHzH44973kd/VoMjqzyBRA="; |
116 | 62 | }; |
117 | 63 |
|
118 | 64 | # requires octoprint itself during tests |
|
127 | 73 | (self: super: { |
128 | 74 | octoprint = self.buildPythonPackage rec { |
129 | 75 | pname = "OctoPrint"; |
130 | | - version = "1.10.3"; |
| 76 | + version = "1.11.0"; |
131 | 77 |
|
132 | 78 | src = fetchFromGitHub { |
133 | 79 | owner = "OctoPrint"; |
134 | 80 | repo = "OctoPrint"; |
135 | 81 | rev = version; |
136 | | - hash = "sha256-BToW1/AcQ01OK7RWZrkstX2M4+uKuL/wFB6HGkVUflk="; |
| 82 | + hash = "sha256-HvIMssPpRhzG//eyf0SfM5ddTUMr82F4ZS7c9tp88qw="; |
137 | 83 | }; |
138 | 84 |
|
139 | 85 | propagatedBuildInputs = |
|
153 | 99 | flask-login |
154 | 100 | flask-limiter |
155 | 101 | frozendict |
156 | | - future |
157 | 102 | itsdangerous |
158 | 103 | immutabledict |
159 | 104 | jinja2 |
|
0 commit comments