tjh.dev
python3Packages.cherrypy: fix tests after upgrade to pytest5
+17
pkgs/development/python-modules/cherrypy/default.nix
+17
pkgs/development/python-modules/cherrypy/default.nix
···
2
2
, setuptools_scm
3
3
, cheroot, portend, more-itertools, zc_lockfile, routes
4
4
, objgraph, pytest, pytestcov, pathpy, requests_toolbelt, pytest-services
5
+
, fetchpatch
5
6
}:
6
7
7
8
buildPythonPackage rec {
···
15
16
inherit version;
16
17
sha256 = "1w3hpsg7q8shdmscmbqk00w90lcw3brary7wl1a56k5h7nx33pj8";
17
18
};
19
+
20
+
# Remove patches once 96b34df and 14c12d2
21
+
# become part of a release - they're currently only present in master.
22
+
# ref: https://github.com/cherrypy/cherrypy/pull/1791
23
+
patches = [
24
+
(fetchpatch {
25
+
name = "pytest5-1.patch";
26
+
url = "https://github.com/cherrypy/cherrypy/commit/96b34dfea7853b0189bc0a3878b6ddff0d4e505c.patch";
27
+
sha256 = "0zy53mahffgkpd844118b42lsk5lkjmig70d60x1i46w6gnr61mi";
28
+
})
29
+
(fetchpatch {
30
+
name = "pytest5-2.patch";
31
+
url = "https://github.com/cherrypy/cherrypy/commit/14c12d2420a4b3765bb241250bd186e93b2f25eb.patch";
32
+
sha256 = "0ihcz7b5myn923rq5665b98pz52hnf6fcys2y2inf23r3i07scyz";
33
+
})
34
+
];
18
35
19
36
propagatedBuildInputs = [
20
37
# required