diff options
| author | Robert T. McGibbon <rmcgibbo@gmail.com> | 2021-03-24 14:03:07 -0400 |
|---|---|---|
| committer | Robert T. McGibbon <rmcgibbo@gmail.com> | 2021-03-24 14:03:07 -0400 |
| commit | 99d1a176fcc82d9a20349935003da034cbb56ba7 (patch) | |
| tree | 5fc30c9b1ab86824ed5c81c69596ac1c2a3b4c28 /pkgs/development/python-modules/cherrypy | |
| parent | 7865db274bffa497feef0c07aa7d7ace86734561 (diff) | |
| download | nixpkgs-99d1a176fcc82d9a20349935003da034cbb56ba7.tar nixpkgs-99d1a176fcc82d9a20349935003da034cbb56ba7.tar.gz nixpkgs-99d1a176fcc82d9a20349935003da034cbb56ba7.tar.bz2 nixpkgs-99d1a176fcc82d9a20349935003da034cbb56ba7.tar.lz nixpkgs-99d1a176fcc82d9a20349935003da034cbb56ba7.tar.xz nixpkgs-99d1a176fcc82d9a20349935003da034cbb56ba7.tar.zst nixpkgs-99d1a176fcc82d9a20349935003da034cbb56ba7.zip | |
python3Packages.cherrypy: unbreak
Diffstat (limited to 'pkgs/development/python-modules/cherrypy')
| -rw-r--r-- | pkgs/development/python-modules/cherrypy/default.nix | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix index 8a915d520e5..9a01a030e68 100644 --- a/pkgs/development/python-modules/cherrypy/default.nix +++ b/pkgs/development/python-modules/cherrypy/default.nix @@ -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 ]; |