summary refs log tree commit diff
path: root/pkgs/top-level/python-packages.nix
diff options
context:
space:
mode:
authorJörg Thalheim <Mic92@users.noreply.github.com>2018-04-14 17:49:42 +0100
committerGitHub <noreply@github.com>2018-04-14 17:49:42 +0100
commitd4597784f4b8d1db8febcd05dc2469cc0323e71b (patch)
treed144894a071f77bd0b57db746f871c88e3ea2f35 /pkgs/top-level/python-packages.nix
parent4d7da18f5c09f04249a125143d49c3da5117b951 (diff)
parent2dcb1026a335c41df1b45a51b95ddc7af92120ba (diff)
downloadnixlib-d4597784f4b8d1db8febcd05dc2469cc0323e71b.tar
nixlib-d4597784f4b8d1db8febcd05dc2469cc0323e71b.tar.gz
nixlib-d4597784f4b8d1db8febcd05dc2469cc0323e71b.tar.bz2
nixlib-d4597784f4b8d1db8febcd05dc2469cc0323e71b.tar.lz
nixlib-d4597784f4b8d1db8febcd05dc2469cc0323e71b.tar.xz
nixlib-d4597784f4b8d1db8febcd05dc2469cc0323e71b.tar.zst
nixlib-d4597784f4b8d1db8febcd05dc2469cc0323e71b.zip
Merge pull request #38814 from timokau/rpy2-unbreak
rpy2: unbreak build
Diffstat (limited to 'pkgs/top-level/python-packages.nix')
-rw-r--r--pkgs/top-level/python-packages.nix24
1 files changed, 1 insertions, 23 deletions
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index afdba0c016b9..d5e3a11236c4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2940,7 +2940,6 @@ in {
         wrapProgram $out/bin/gtimelog \
           --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
           --prefix LD_LIBRARY_PATH ":" "${pkgs.gtk3.out}/lib" \
-
     '';
 
     meta = {
@@ -12444,28 +12443,7 @@ in {
 
   rpmfluff = callPackage ../development/python-modules/rpmfluff {};
 
-  rpy2 = buildPythonPackage rec {
-    name = "rpy2-2.8.2";
-    disabled = isPyPy;
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/r/rpy2/${name}.tar.gz";
-      sha256 = "2c1a313df4e64236dcfe1078ce847b8e3c180656c894928d3a4b391aacb9b24c";
-    };
-    buildInputs = with pkgs; [ readline R pcre lzma bzip2 zlib icu ];
-    propagatedBuildInputs = with self; [ singledispatch six ];
-
-    # According to manual this is how the testsuite should be invoked
-    checkPhase = ''
-      ${python.interpreter}  -m rpy2.tests
-    '';
-    meta = {
-      homepage = http://rpy.sourceforge.net/rpy2;
-      description = "Python interface to R";
-      license = licenses.gpl2Plus;
-      maintainers = with maintainers; [ joelmo ];
-      broken = true;
-    };
-  };
+  rpy2 = callPackage ../development/python-modules/rpy2 {};
 
   rpyc = buildPythonPackage rec {
     name = "rpyc-${version}";