Skip to content

Commit

Permalink
R: Revert "import upstream patch to fix broken "R CMD Sweave" command"
Browse files Browse the repository at this point in the history
This reverts commit 76296ce. That patch is
intended for R 3.4.0 only. Not sure this commit ever appeared here in this
branch. It looks like *I* committed it??? Must have been confused.

Closes NixOS#25572.
  • Loading branch information
adrianpk committed May 19, 2017
1 parent 004474c commit d7effc2
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 54 deletions.
4 changes: 2 additions & 2 deletions pkgs/applications/science/math/R/default.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, bzip2, gfortran, libX11, libXmu, libXt, libjpeg, libpng
, libtiff, ncurses, pango, pcre, perl, readline, tcl, texLive, tk, xz, zlib
, less, texinfo, graphviz, icu, pkgconfig, bison, imake, which, jdk, openblas
, curl, Cocoa, Foundation, cf-private, libobjc, tzdata, fetchpatch
, curl, Cocoa, Foundation, cf-private, libobjc, tzdata
, withRecommendedPackages ? true
, enableStrictBarrier ? false
}:
Expand All @@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ tcl tk ]
++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa Foundation cf-private libobjc ];

patches = [ ./no-usr-local-search-paths.patch ./fix-sweave-exit-code.patch ];
patches = [ ./no-usr-local-search-paths.patch ];

preConfigure = ''
configureFlagsArray=(
Expand Down
52 changes: 0 additions & 52 deletions pkgs/applications/science/math/R/fix-sweave-exit-code.patch

This file was deleted.

0 comments on commit d7effc2

Please sign in to comment.