@@ -2,7 +2,7 @@
22, stdenv
33, lib
44, fetchFromGitHub
5−, python38
5+, python3
66, substituteAll
77, nix-update-script
88 # To include additional plugins, pass them here as an overlay.
@@ -21,7 +21,7 @@ let
2121 );
2222 };
2323
24− py = python38.override {
24+ py = python3.override {
2525 self = py;
2626 packageOverrides = lib.foldr lib.composeExtensions (self: super: {}) (
2727 [
@@ -33,17 +33,15 @@ let
3333 (mkOverride "jinja2" "2.11.3" "a6d58433de0ae800347cab1fa3043cebbabe8baa9d29e668f1c768cb87a333c6")
3434 (mkOverride "markdown" "3.1.1" "2e50876bcdd74517e7b71f3e7a76102050edec255b3983403f1a63e7c8a41e7a")
3535 (mkOverride "markupsafe" "1.1.1" "29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b")
36− (mkOverride "sarge" "0.1.5.post0" "1c1ll7pys9vra5cfi8jxlgrgaql6c27l6inpy15aprgqhc4ck36s")
37− (mkOverride "tornado" "5.1.1" "4e5158d97583502a7e2739951553cbd88a72076f152b4b11b64b9a10c4c49409")
3836
3937 # Requires flask<2, cannot mkOverride because tests need to be disabled
4038 (
4139 self: super: {
4240 flask = super.flask.overridePythonAttrs (oldAttrs: rec {
43− version = "1.1.2";
41+ version = "1.1.4";
4442 src = oldAttrs.src.override {
4543 inherit version;
46− sha256 = "4efa1ae2d7c9865af48986de8aeb8504bf32c7f3d6fdc9353d34b21f4b127060";
44+ sha256 = "15ni4xlm57a15f5hipp8w0c9zba20179bvfns2392fiq1lcbdghg";
4745 };
4846 doCheck = false;
4947 });
@@ -84,13 +82,18 @@ let
8482 self: super: {
8583 websocket-client = super.websocket-client.overridePythonAttrs (
8684 oldAttrs: rec {
87− version = "0.58.0";
85+ version = "0.59.0";
8886 src = oldAttrs.src.override {
89− pname = "websocket_client";
9087 inherit version;
91− sha256 = "63509b41d158ae5b7f67eb4ad20fecbb4eee99434e73e140354dc3ff8e09716f";
88+ sha256 = "0p0cz2mdissq7iw1n7jrmsfir0jfmgs1dvnpnrx477ffx9hbsxnk";
9289 };
93− propagatedBuildInputs = [ self.six ];
90+ propagatedBuildInputs = with self; [
91+ six
92+ pysocks
93+ ];
94+ disabledTests = [
95+ "testConnect" # requires network access
96+ ];
9497 }
9598 );
9699 }
@@ -179,19 +182,20 @@ let
179182 self: super: {
180183 octoprint = self.buildPythonPackage rec {
181184 pname = "OctoPrint";
182− version = "1.6.1";
185+ version = "1.7.2";
183186
184187 src = fetchFromGitHub {
185188 owner = "OctoPrint";
186189 repo = "OctoPrint";
187190 rev = version;
188− sha256 = "sha256-3b3k9h8H9Spf/P3/pXpCANnSGOgbUw/EWISJbrSoPBM=";
191+ sha256 = "sha256-jCfzUx3LQ7TlXKQU8qbhyS1P4Wew/SSgJHVSc1VLdx4=";
189192 };
190193
191194 propagatedBuildInputs = with super; [
192195 blinker
193196 cachelib
194197 click
198+ colorlog
195199 emoji
196200 feedparser
197201 filetype
@@ -211,6 +215,7 @@ let
211215 octoprint-filecheck
212216 octoprint-firmwarecheck
213217 octoprint-pisupport
218+ pathvalidate
214219 pkginfo
215220 pip
216221 psutil
@@ -252,10 +257,14 @@ let
252257
253258 postPatch = let
254259 ignoreVersionConstraints = [
260+ "cachelib"
261+ "colorlog"
255262 "emoji"
256263 "immutabledict"
257264 "sentry-sdk"
258265 "watchdog"
266+ "wrapt"
267+ "zeroconf"
259268 ];
260269 in
261270 ''