@@ -25,13 +25,30 @@ let
2525 [
2626 # the following dependencies are non trivial to update since later versions introduce backwards incompatible
2727 # changes that might affect plugins, or due to other observed problems
28− (mkOverride "markupsafe" "1.1.1" "29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b")
28+ (mkOverride "flask-babel" "1.0.0" "0gmb165vkwv5v7dxsxa2i3zhafns0fh938m2zdcrv4d8z5l099yn")
2929 (mkOverride "rsa" "4.0" "1a836406405730121ae9823e19c6e806c62bbad73f890574fff50efa4122c487")
3030 (mkOverride "markdown" "3.1.1" "2e50876bcdd74517e7b71f3e7a76102050edec255b3983403f1a63e7c8a41e7a")
3131 (mkOverride "tornado" "5.1.1" "4e5158d97583502a7e2739951553cbd88a72076f152b4b11b64b9a10c4c49409")
3232 (mkOverride "unidecode" "0.04.21" "280a6ab88e1f2eb5af79edff450021a0d3f0448952847cd79677e55e58bad051")
3333 (mkOverride "sarge" "0.1.5.post0" "1c1ll7pys9vra5cfi8jxlgrgaql6c27l6inpy15aprgqhc4ck36s")
3434
35+ # Octoprint needs zeroconf >=0.24 <0.25. While this should be done in
36+ # the mkOverride aboves, this package also has broken tests, so we need
37+ # a proper override.
38+ (
39+ self: super: {
40+ zeroconf = super.zeroconf.overrideAttrs (oldAttrs: rec {
41+ version = "0.24.5";
42+ src = oldAttrs.src.override {
43+ inherit version;
44+ sha256 = "0jpgd0rk91si93857mjrizan5gc42kj1q4fi4160qgk68la88fl9";
45+ };
46+ buildInputs = [ self.nose ];
47+ checkPhase = "nosetests";
48+ });
49+ }
50+ )
51+
3552 # Built-in dependency
3653 (
3754 self: super: {
@@ -55,13 +72,13 @@ let
5572 self: super: {
5673 octoprint-firmwarecheck = self.buildPythonPackage rec {
5774 pname = "OctoPrint-FirmwareCheck";
58− version = "2020.06.22";
75+ version = "2020.09.23";
5976
6077 src = fetchFromGitHub {
6178 owner = "OctoPrint";
6279 repo = "OctoPrint-FirmwareCheck";
6380 rev = version;
64− sha256 = "19y7hrgg9z8hl7cwqkvg8nc8bk0wwrsfvjd1wawy33wn60psqv1h";
81+ sha256 = "1l1ajhnsc39prgk59mp93h90dgl9gh660cci00z5b5gj2h6dv1d1";
6582 };
6683 doCheck = false;
6784 };
@@ -72,53 +89,54 @@ let
7289 self: super: {
7390 octoprint = self.buildPythonPackage rec {
7491 pname = "OctoPrint";
75− version = "1.4.2";
92+ version = "1.5.1";
7693
7794 src = fetchFromGitHub {
7895 owner = "OctoPrint";
7996 repo = "OctoPrint";
8097 rev = version;
81− sha256 = "1bblrjwkccy1ifw7lf55g3k9lq1sqzwd49vj8bfzj2w07a7qda62";
98+ sha256 = "04x58cjivslsrld341ip11c50d50p2q01090nsyji0j255v986j9";
8299 };
83100
84101 propagatedBuildInputs = with super; [
85− octoprint-firmwarecheck
86− octoprint-filecheck
87− markupsafe
88− tornado
89− markdown
90− rsa
91− regex
102+ blinker
103+ cachelib
104+ click
105+ emoji
106+ feedparser
107+ filetype
92108 flask
93− jinja2
94− flask_login
95109 flask-babel
96110 flask_assets
97− werkzeug
111+ flask_login
112+ frozendict
113+ future
98114 itsdangerous
99− cachelib
100− pyyaml
101− pyserial
115+ jinja2
116+ markdown
117+ markupsafe
102118 netaddr
103− watchdog
104− sarge
105119 netifaces
106− pylru
120+ octoprint-filecheck
121+ octoprint-firmwarecheck
107122 pkginfo
123+ psutil
124+ pylru
125+ pyserial
126+ pyyaml
127+ regex
108128 requests
129+ rsa
130+ sarge
109131 semantic-version
110− psutil
111− click
112− feedparser
113− future
114− websocket_client
115− wrapt
116− emoji
117− frozendict
118132 sentry-sdk
119− filetype
133+ tornado
120134 unidecode
121− blinker
135+ watchdog
136+ websocket_client
137+ werkzeug
138+ wrapt
139+ zeroconf
122140 ] ++ lib.optionals stdenv.isDarwin [ py.pkgs.appdirs ];
123141
124142 checkInputs = with super; [ pytestCheckHook mock ddt ];