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