jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #117498 from rmcgibbo/cherrypy

Browse Source 
python3Packages.cherrypy: unbreak
This commit is contained in:
Sandro 2021-03-24 20:30:33 +01:00 committed by GitHub
commit c1cd574165
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/development/python-modules/cherrypy/default.nix
View File

@ -18,6 +18,26 @@ buildPythonPackage rec {
sha256 = "16f410izp2c4qhn4n3l5l3qirmkf43h2amjqms8hkl0shgfqwq2n";
};
patches = [
# 1/3 Fix compatibility with pytest 6. Will be part of the next release after 18.6
(fetchpatch {
url = "https://github.com/cherrypy/cherrypy/pull/1897/commits/59c0e19d7df8680e36afc96756dce72435121448.patch";
sha256 = "1jachbvp505gndccdhny0c3grzdrmvmbzq4kw55jx93ay94ni6p0";
})
# 2/3 Fix compatibility with pytest 6. Will be part of the next release after 18.6
(fetchpatch {
url = "https://github.com/cherrypy/cherrypy/pull/1897/commits/4a6287b73539adcb7b0ae72d69644a1ced1f7eaa.patch";
sha256 = "0nz40qmgxknkbjsdzfzcqfxdsmsxx3v104fb0h04yvs76mqvw3i4";
})
# 3/3 Fix compatibility with pytest 6. Will be part of the next release after 18.6
(fetchpatch {
url = "https://github.com/cherrypy/cherrypy/commit/3bae7f06868553b006915f05ff14d86163f59a7d.patch";
sha256 = "1z0bv23ybyw87rf1i8alsdi3gc2bzmdj9d0kjsghdkvi3zdp4n8q";
})
];
nativeBuildInputs = [ setuptools_scm ];
propagatedBuildInputs = [
# required
cheroot portend more-itertools zc_lockfile
@ -26,8 +46,6 @@ buildPythonPackage rec {
routes
];
nativeBuildInputs = [ setuptools_scm ];
checkInputs = [
objgraph pytest pytestcov pathpy requests_toolbelt pytest-services
];