diff options
| author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2022-12-29 15:12:14 +0100 |
|---|---|---|
| committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2023-01-05 01:08:48 +0100 |
| commit | af8b9c216bad5380ba0d912f5f8e9d3f99f8abd4 (patch) | |
| tree | 094a83b46cc527b9c3723c4cb0128f4ce944204c /pkgs/development/python-modules/cffi | |
| parent | b9b53676235f78cce2939913bd16480173ed6479 (diff) | |
python3Packages.cffi: Apply patches for pytest 7.2.0 compat
Diffstat (limited to 'pkgs/development/python-modules/cffi')
| -rw-r--r-- | pkgs/development/python-modules/cffi/default.nix | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix index fb08761a52846..266c3deb56422 100644 --- a/pkgs/development/python-modules/cffi/default.nix +++ b/pkgs/development/python-modules/cffi/default.nix @@ -32,6 +32,24 @@ if isPyPy then null else buildPythonPackage rec { # deemed safe to trust in cffi. # ./darwin-use-libffi-closures.diff + (fetchpatch { + # Drop py.code usage from tests, no longer depend on the deprecated py package + url = "https://foss.heptapod.net/pypy/cffi/-/commit/9c7d865e17ec16a847090a3e0d1498b698b99756.patch"; + excludes = [ + "README.md" + "requirements.txt" + ]; + hash = "sha256-HSuLLIYXXGGCPccMNLV7o1G3ppn2P0FGCrPjqDv2e7k="; + }) + (fetchpatch { + # Replace py.test usage with pytest + url = "https://foss.heptapod.net/pypy/cffi/-/commit/bd02e1b122612baa74a126e428bacebc7889e897.patch"; + excludes = [ + "README.md" + "requirements.txt" + ]; + hash = "sha256-+2daRTvxtyrCPimOEAmVbiVm1Bso9hxGbaAbd03E+ws="; + }) ] ++ lib.optionals (pythonAtLeast "3.11") [ # Fix test that failed because python seems to have changed the exception format in the # final release. This patch should be included in the next version and can be removed when |