summary refs log tree commit diff
diff options
context:
space:
mode:
authorDomen Kožar <domen@dev.si>2015-03-25 10:02:08 +0100
committerDomen Kožar <domen@dev.si>2015-03-25 10:02:08 +0100
commit58b4f112426a487f1c579b7ffb37871cb71fe442 (patch)
treead6419471b6536367ab682753df0d60d4e53723d
parent13dae62ec2621a2c28e131ac59adabe71f0de2ec (diff)
downloadnixlib-58b4f112426a487f1c579b7ffb37871cb71fe442.tar
nixlib-58b4f112426a487f1c579b7ffb37871cb71fe442.tar.gz
nixlib-58b4f112426a487f1c579b7ffb37871cb71fe442.tar.bz2
nixlib-58b4f112426a487f1c579b7ffb37871cb71fe442.tar.lz
nixlib-58b4f112426a487f1c579b7ffb37871cb71fe442.tar.xz
nixlib-58b4f112426a487f1c579b7ffb37871cb71fe442.tar.zst
nixlib-58b4f112426a487f1c579b7ffb37871cb71fe442.zip
Revert "RStudio: initial commit at version 0.98.110"
This reverts commit 56e21d05e874a29ad0d51aea18e8c982c7c826f3.

It's missing a file, see https://github.com/NixOS/nixpkgs/pull/6957
-rw-r--r--pkgs/applications/editors/rstudio/default.nix71
-rw-r--r--pkgs/top-level/all-packages.nix2
2 files changed, 0 insertions, 73 deletions
diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix
deleted file mode 100644
index c3ecbf0a60f5..000000000000
--- a/pkgs/applications/editors/rstudio/default.nix
+++ /dev/null
@@ -1,71 +0,0 @@
-{ stdenv, fetchurl, cmake, boost155, zlib, openssl, R, qt4, libuuid, hunspellDicts, unzip, ant, jdk }:
-
-let
-  version = "0.98.110";
-  ginVer = "1.5";
-  gwtVer = "2.5.1";
-in
-stdenv.mkDerivation {
-  name = "RStudio-${version}";
-
-  buildInputs = [ cmake boost155 zlib openssl R qt4 libuuid unzip ant jdk ];
-
-  src = fetchurl {
-    url = "https://github.com/rstudio/rstudio/archive/v${version}.tar.gz";
-    sha256 = "0wybbvl5libki8z2ywgcd0hg0py1az484r95lhwh3jbrwfx7ri2z";
-  };
-
-  # Hack RStudio to only use the input R.
-  patches = [ ./r-location.patch ];
-  postPatch = "substituteInPlace src/cpp/core/r_util/REnvironmentPosix.cpp --replace '@R@' ${R}";
-
-  inherit ginVer;
-  ginSrc = fetchurl {
-    url = "https://s3.amazonaws.com/rstudio-buildtools/gin-${ginVer}.zip";
-    sha256 = "155bjrgkf046b8ln6a55x06ryvm8agnnl7l8bkwwzqazbpmz8qgm";
-  };
-
-  inherit gwtVer;
-  gwtSrc = fetchurl {
-    url = "https://s3.amazonaws.com/rstudio-buildtools/gwt-${gwtVer}.zip";
-    sha256 = "0fjr2rcr8lnywj54mzhg9i4xz1b6fh8yv12p5i2q5mgfld2xymy4";
-  };
-
-  hunspellDicts = builtins.attrValues hunspellDicts;
-
-  mathJaxSrc = fetchurl {
-    url = https://s3.amazonaws.com/rstudio-buildtools/mathjax-20.zip;
-    sha256 = "1ikg3fhharsfrh2fv8c53fdawqajj24nif89400l3klw1hyq4zal";
-  };
-
-  preConfigure =
-    ''
-      GWT_LIB_DIR=src/gwt/lib
-
-      mkdir -p $GWT_LIB_DIR/gin/$ginVer
-      unzip $ginSrc -d $GWT_LIB_DIR/gin/$ginVer
-
-      unzip $gwtSrc
-      mkdir -p $GWT_LIB_DIR/gwt
-      mv gwt-$gwtVer $GWT_LIB_DIR/gwt/$gwtVer
-
-      mkdir dependencies/common/dictionaries
-      for dict in $hunspellDicts; do
-          for i in $dict/share/hunspell/*
-	  do ln -sv $i dependencies/common/dictionaries/
-	  done
-      done
-
-      unzip $mathJaxSrc -d dependencies/common/mathjax
-    '';
-
-  cmakeFlags = [ "-DRSTUDIO_TARGET=Desktop" ];
-
-  meta = with stdenv.lib;
-    { description = "Set of integrated tools for the R language";
-      homepage = http://www.rstudio.com/;
-      license = licenses.agpl3;
-      maintainers = [ maintainers.emery ];
-      platforms = platforms.linux;
-    };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 80158f1c72ab..0b6c95a557ca 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11519,8 +11519,6 @@ let
     automake = automake114x;
   };
 
-  rstudio = callPackage ../applications/editors/rstudio { };
-
   rsync = callPackage ../applications/networking/sync/rsync {
     enableACLs = !(stdenv.isDarwin || stdenv.isSunOS || stdenv.isFreeBSD);
     enableCopyDevicesPatch = (config.rsync.enableCopyDevicesPatch or false);