Skip to content

Commit 05b2da8

Browse files
committedMay 19, 2017
R: Revert "import upstream patch to fix broken "R CMD Sweave" command"
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 #25572.
1 parent 02a188c commit 05b2da8

File tree

2 files changed

+2
-54
lines changed

2 files changed

+2
-54
lines changed
 

‎pkgs/applications/science/math/R/default.nix

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{ stdenv, fetchurl, bzip2, gfortran, libX11, libXmu, libXt, libjpeg, libpng
22
, libtiff, ncurses, pango, pcre, perl, readline, tcl, texLive, tk, xz, zlib
33
, less, texinfo, graphviz, icu, pkgconfig, bison, imake, which, jdk, openblas
4-
, curl, Cocoa, Foundation, cf-private, libobjc, tzdata, fetchpatch
4+
, curl, Cocoa, Foundation, cf-private, libobjc, tzdata
55
, withRecommendedPackages ? true
66
, enableStrictBarrier ? false
77
}:
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
2121
] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ tcl tk ]
2222
++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa Foundation cf-private libobjc ];
2323

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

2626
preConfigure = ''
2727
configureFlagsArray=(

‎pkgs/applications/science/math/R/fix-sweave-exit-code.patch

-52
This file was deleted.

0 commit comments

Comments
 (0)