diff options
author | Mauricio Collares <mauricio@collares.org> | 2024-03-21 10:56:26 +0100 |
---|---|---|
committer | Mauricio Collares <mauricio@collares.org> | 2024-03-21 11:44:14 +0100 |
commit | 953450bf45bf58804d77c6e7b11030840c065831 (patch) | |
tree | 522eac9f91ad77c19ed36abf67b8d3252f49e573 /pkgs | |
parent | c2b7425324a3fa95e064216c503c2ac2e89abe57 (diff) |
python311Packages.rpy2: adapt tests to pytest 8
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/python-modules/rpy2/default.nix | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/development/python-modules/rpy2/default.nix b/pkgs/development/python-modules/rpy2/default.nix index 0270832326502..c10b23414b425 100644 --- a/pkgs/development/python-modules/rpy2/default.nix +++ b/pkgs/development/python-modules/rpy2/default.nix @@ -2,6 +2,7 @@ , lib , buildPythonPackage , fetchPypi +, fetchpatch , isPyPy , R , rWrapper @@ -38,6 +39,12 @@ buildPythonPackage rec { # R_LIBS_SITE is used by the nix r package to point to the installed R libraries. # This patch sets R_LIBS_SITE when rpy2 is imported. ./rpy2-3.x-r-libs-site.patch + + # https://github.com/rpy2/rpy2/pull/1094 + (fetchpatch { + url = "https://github.com/rpy2/rpy2/commit/026d069a008163a62d12567bcb938410d0f9bf7a.diff"; + hash = "sha256-x778upSY3zab5EiRyOcsbDpPj7vN/7XzefEs+wvkNg0="; + }) ]; postPatch = '' @@ -82,10 +89,6 @@ buildPythonPackage rec { doCheck = !stdenv.isDarwin; - # newlines in environment variables are a problem due to - # https://github.com/rpy2/rpy2/issues/1066 - preCheck = "unset postPatch"; - nativeCheckInputs = [ pytestCheckHook ]; |