Skip to content

Commit 1053d3a

Browse files
octoprint: 1.10.3 -> 1.11.0 (#400841)
2 parents 28bc202 + 7c09dad commit 1053d3a

File tree

1 file changed

+4
-59
lines changed

1 file changed

+4
-59
lines changed

pkgs/by-name/oc/octoprint/package.nix

Lines changed: 4 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
callPackage,
55
lib,
66
fetchFromGitHub,
7-
fetchPypi,
87
python3,
98
replaceVars,
109
nix-update-script,
@@ -17,59 +16,6 @@ let
1716
py = python3.override {
1817
self = py;
1918
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-
7319
# Built-in dependency
7420
(self: super: {
7521
octoprint-filecheck = self.buildPythonPackage rec {
@@ -105,14 +51,14 @@ let
10551
(self: super: {
10652
octoprint-pisupport = self.buildPythonPackage rec {
10753
pname = "OctoPrint-PiSupport";
108-
version = "2023.5.24";
54+
version = "2023.10.10";
10955
format = "setuptools";
11056

11157
src = fetchFromGitHub {
11258
owner = "OctoPrint";
11359
repo = "OctoPrint-PiSupport";
11460
rev = version;
115-
hash = "sha256-KfkZXJ2f02G2ee+J1w+YQRKz+LSWwxVIIwmdevDGhew=";
61+
hash = "sha256-VSzDoFq4Yn6KOn+RNi1uVJHzH44973kd/VoMjqzyBRA=";
11662
};
11763

11864
# requires octoprint itself during tests
@@ -127,13 +73,13 @@ let
12773
(self: super: {
12874
octoprint = self.buildPythonPackage rec {
12975
pname = "OctoPrint";
130-
version = "1.10.3";
76+
version = "1.11.0";
13177

13278
src = fetchFromGitHub {
13379
owner = "OctoPrint";
13480
repo = "OctoPrint";
13581
rev = version;
136-
hash = "sha256-BToW1/AcQ01OK7RWZrkstX2M4+uKuL/wFB6HGkVUflk=";
82+
hash = "sha256-HvIMssPpRhzG//eyf0SfM5ddTUMr82F4ZS7c9tp88qw=";
13783
};
13884

13985
propagatedBuildInputs =
@@ -153,7 +99,6 @@ let
15399
flask-login
154100
flask-limiter
155101
frozendict
156-
future
157102
itsdangerous
158103
immutabledict
159104
jinja2

0 commit comments

Comments
 (0)