tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
octoprint: 1.6.1 -> 1.7.2
Martin Weinelt
4 years ago
fa88683e
8817170f
+21
-12
1 changed file
expand all
collapse all
unified
split
pkgs
applications
misc
octoprint
default.nix
+21
-12
pkgs/applications/misc/octoprint/default.nix
···
2
2
, stdenv
3
3
, lib
4
4
, fetchFromGitHub
5
5
-
, python38
5
5
+
, python3
6
6
, substituteAll
7
7
, nix-update-script
8
8
# To include additional plugins, pass them here as an overlay.
···
21
21
);
22
22
};
23
23
24
24
-
py = python38.override {
24
24
+
py = python3.override {
25
25
self = py;
26
26
packageOverrides = lib.foldr lib.composeExtensions (self: super: {}) (
27
27
[
···
33
33
(mkOverride "jinja2" "2.11.3" "a6d58433de0ae800347cab1fa3043cebbabe8baa9d29e668f1c768cb87a333c6")
34
34
(mkOverride "markdown" "3.1.1" "2e50876bcdd74517e7b71f3e7a76102050edec255b3983403f1a63e7c8a41e7a")
35
35
(mkOverride "markupsafe" "1.1.1" "29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b")
36
36
-
(mkOverride "sarge" "0.1.5.post0" "1c1ll7pys9vra5cfi8jxlgrgaql6c27l6inpy15aprgqhc4ck36s")
37
37
-
(mkOverride "tornado" "5.1.1" "4e5158d97583502a7e2739951553cbd88a72076f152b4b11b64b9a10c4c49409")
38
36
39
37
# Requires flask<2, cannot mkOverride because tests need to be disabled
40
38
(
41
39
self: super: {
42
40
flask = super.flask.overridePythonAttrs (oldAttrs: rec {
43
43
-
version = "1.1.2";
41
41
+
version = "1.1.4";
44
42
src = oldAttrs.src.override {
45
43
inherit version;
46
46
-
sha256 = "4efa1ae2d7c9865af48986de8aeb8504bf32c7f3d6fdc9353d34b21f4b127060";
44
44
+
sha256 = "15ni4xlm57a15f5hipp8w0c9zba20179bvfns2392fiq1lcbdghg";
47
45
};
48
46
doCheck = false;
49
47
});
···
84
82
self: super: {
85
83
websocket-client = super.websocket-client.overridePythonAttrs (
86
84
oldAttrs: rec {
87
87
-
version = "0.58.0";
85
85
+
version = "0.59.0";
88
86
src = oldAttrs.src.override {
89
89
-
pname = "websocket_client";
90
87
inherit version;
91
91
-
sha256 = "63509b41d158ae5b7f67eb4ad20fecbb4eee99434e73e140354dc3ff8e09716f";
88
88
+
sha256 = "0p0cz2mdissq7iw1n7jrmsfir0jfmgs1dvnpnrx477ffx9hbsxnk";
92
89
};
93
93
-
propagatedBuildInputs = [ self.six ];
90
90
+
propagatedBuildInputs = with self; [
91
91
+
six
92
92
+
pysocks
93
93
+
];
94
94
+
disabledTests = [
95
95
+
"testConnect" # requires network access
96
96
+
];
94
97
}
95
98
);
96
99
}
···
179
182
self: super: {
180
183
octoprint = self.buildPythonPackage rec {
181
184
pname = "OctoPrint";
182
182
-
version = "1.6.1";
185
185
+
version = "1.7.2";
183
186
184
187
src = fetchFromGitHub {
185
188
owner = "OctoPrint";
186
189
repo = "OctoPrint";
187
190
rev = version;
188
188
-
sha256 = "sha256-3b3k9h8H9Spf/P3/pXpCANnSGOgbUw/EWISJbrSoPBM=";
191
191
+
sha256 = "sha256-jCfzUx3LQ7TlXKQU8qbhyS1P4Wew/SSgJHVSc1VLdx4=";
189
192
};
190
193
191
194
propagatedBuildInputs = with super; [
192
195
blinker
193
196
cachelib
194
197
click
198
198
+
colorlog
195
199
emoji
196
200
feedparser
197
201
filetype
···
211
215
octoprint-filecheck
212
216
octoprint-firmwarecheck
213
217
octoprint-pisupport
218
218
+
pathvalidate
214
219
pkginfo
215
220
pip
216
221
psutil
···
252
257
253
258
postPatch = let
254
259
ignoreVersionConstraints = [
260
260
+
"cachelib"
261
261
+
"colorlog"
255
262
"emoji"
256
263
"immutabledict"
257
264
"sentry-sdk"
258
265
"watchdog"
266
266
+
"wrapt"
267
267
+
"zeroconf"
259
268
];
260
269
in
261
270
''