diff options
author | Alyssa Ross <hi@alyssa.is> | 2024-03-24 11:04:41 +0100 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2024-03-24 11:04:41 +0100 |
commit | 5423cabbbf2b6dec5568f1ecabd288d5d9a642ec (patch) | |
tree | f316a6a921bfefd3a63bd4502c2eb50ff1644f67 /nixpkgs/pkgs/development/python-modules/rpy2/default.nix | |
parent | 46a88117a05c3469af5d99433af140c3de8ca088 (diff) | |
parent | 8aa81f34981add12aecada6c702ddbbd0375ca36 (diff) | |
download | nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar.gz nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar.bz2 nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar.lz nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar.xz nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar.zst nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.zip |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules/rpy2/default.nix')
-rw-r--r-- | nixpkgs/pkgs/development/python-modules/rpy2/default.nix | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/rpy2/default.nix b/nixpkgs/pkgs/development/python-modules/rpy2/default.nix index 027083232650..c10b23414b42 100644 --- a/nixpkgs/pkgs/development/python-modules/rpy2/default.nix +++ b/nixpkgs/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 ]; |