diff options
| author | Sarah Brofeldt <sbrofeldt@gmail.com> | 2019-09-03 19:23:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-03 19:23:44 +0200 |
| commit | ce8cd5fd00277c307beaf1189bbd4e2a8868cc14 (patch) | |
| tree | 566914958c85f0314a53b5ee94aafb3c9dc27dea /pkgs | |
| parent | ce944b4bdedcd8619b75989b79188f26a16a2b5f (diff) | |
| parent | 585c9e2b10d2ae1fac38c66104aea59cfa8317c0 (diff) | |
| download | nixpkgs-ce8cd5fd00277c307beaf1189bbd4e2a8868cc14.tar nixpkgs-ce8cd5fd00277c307beaf1189bbd4e2a8868cc14.tar.gz nixpkgs-ce8cd5fd00277c307beaf1189bbd4e2a8868cc14.tar.bz2 nixpkgs-ce8cd5fd00277c307beaf1189bbd4e2a8868cc14.tar.lz nixpkgs-ce8cd5fd00277c307beaf1189bbd4e2a8868cc14.tar.xz nixpkgs-ce8cd5fd00277c307beaf1189bbd4e2a8868cc14.tar.zst nixpkgs-ce8cd5fd00277c307beaf1189bbd4e2a8868cc14.zip | |
Merge pull request #68001 from johanot/fix-cherrypy
python3Packages.cherrypy: fix tests after upgrade to pytest5
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/python-modules/cherrypy/default.nix | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix index 75152d39aeb..6941e1117bd 100644 --- a/pkgs/development/python-modules/cherrypy/default.nix +++ b/pkgs/development/python-modules/cherrypy/default.nix @@ -2,6 +2,7 @@ , setuptools_scm , cheroot, portend, more-itertools, zc_lockfile, routes , objgraph, pytest, pytestcov, pathpy, requests_toolbelt, pytest-services +, fetchpatch }: buildPythonPackage rec { @@ -16,6 +17,22 @@ buildPythonPackage rec { sha256 = "1w3hpsg7q8shdmscmbqk00w90lcw3brary7wl1a56k5h7nx33pj8"; }; + # Remove patches once 96b34df and 14c12d2 + # become part of a release - they're currently only present in master. + # ref: https://github.com/cherrypy/cherrypy/pull/1791 + patches = [ + (fetchpatch { + name = "pytest5-1.patch"; + url = "https://github.com/cherrypy/cherrypy/commit/96b34dfea7853b0189bc0a3878b6ddff0d4e505c.patch"; + sha256 = "0zy53mahffgkpd844118b42lsk5lkjmig70d60x1i46w6gnr61mi"; + }) + (fetchpatch { + name = "pytest5-2.patch"; + url = "https://github.com/cherrypy/cherrypy/commit/14c12d2420a4b3765bb241250bd186e93b2f25eb.patch"; + sha256 = "0ihcz7b5myn923rq5665b98pz52hnf6fcys2y2inf23r3i07scyz"; + }) + ]; + propagatedBuildInputs = [ # required cheroot portend more-itertools zc_lockfile |