diff options
| author | Peter Simons <simons@cryp.to> | 2017-06-30 13:37:26 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2017-06-30 13:37:26 +0200 |
| commit | 4c5577b504ee4d01a4fb027269cfb510368dd701 (patch) | |
| tree | 5937484daff96a36a1befd7c4a1bdab02663e0fa /pkgs/applications/science | |
| parent | 081a071371663ad6ea2b3dec54f24d067f5903e6 (diff) | |
| download | nixlib-4c5577b504ee4d01a4fb027269cfb510368dd701.tar nixlib-4c5577b504ee4d01a4fb027269cfb510368dd701.tar.gz nixlib-4c5577b504ee4d01a4fb027269cfb510368dd701.tar.bz2 nixlib-4c5577b504ee4d01a4fb027269cfb510368dd701.tar.lz nixlib-4c5577b504ee4d01a4fb027269cfb510368dd701.tar.xz nixlib-4c5577b504ee4d01a4fb027269cfb510368dd701.tar.zst nixlib-4c5577b504ee4d01a4fb027269cfb510368dd701.zip | |
R: update to version 3.4.1
Diffstat (limited to 'pkgs/applications/science')
| -rw-r--r-- | pkgs/applications/science/math/R/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/applications/science/math/R/fix-sweave-exit-code.patch | 52 |
2 files changed, 3 insertions, 55 deletions
diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index 285673baa3cc..e75ae2222ae9 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -7,11 +7,11 @@ }: stdenv.mkDerivation rec { - name = "R-3.4.0"; + name = "R-3.4.1"; src = fetchurl { url = "http://cran.r-project.org/src/base/R-3/${name}.tar.gz"; - sha256 = "14cb8bwi3akvdb6934kqic2862f2qgav6cq4g0h7gi2p4ka9x3i8"; + sha256 = "0y7wlfk3cn1dxn2mpnxwvsk31s0599crbsyah8srm5pa2mfi7c82"; }; buildInputs = [ @@ -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=( diff --git a/pkgs/applications/science/math/R/fix-sweave-exit-code.patch b/pkgs/applications/science/math/R/fix-sweave-exit-code.patch deleted file mode 100644 index 8ca1be750a59..000000000000 --- a/pkgs/applications/science/math/R/fix-sweave-exit-code.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 0ff560ba912fad126576818519035c8d3c693bed Mon Sep 17 00:00:00 2001 -From: maechler <maechler@00db46b3-68df-0310-9c12-caf00c1e9a41> -Date: Mon, 24 Apr 2017 14:24:11 +0000 -Subject: [PATCH] R CMD Sweave status bug fix - -git-svn-id: https://svn.r-project.org/R/trunk@72612 00db46b3-68df-0310-9c12-caf00c1e9a41 - -diff --git a/src/library/utils/R/Sweave.R b/src/library/utils/R/Sweave.R -index 2beb094..8d4950b 100644 ---- a/src/library/utils/R/Sweave.R -+++ b/src/library/utils/R/Sweave.R -@@ -1,7 +1,7 @@ - # File src/library/utils/R/Sweave.R - # Part of the R package, https://www.R-project.org - # --# Copyright (C) 1995-2016 The R Core Team -+# Copyright (C) 1995-2017 The R Core Team - # - # This program is free software; you can redistribute it and/or modify - # it under the terms of the GNU General Public License as published by -@@ -452,10 +452,10 @@ SweaveHooks <- function(options, run = FALSE, envir = .GlobalEnv) - } - do_exit <- - if(no.q) -- function(status = 1L) (if(status) stop else message)( -+ function(status = 0L) (if(status) stop else message)( - ".Sweave() exit status ", status) - else -- function(status = 1L) q("no", status = status, runLast = FALSE) -+ function(status = 0L) q("no", status = status, runLast = FALSE) - - if (!length(args)) { - Usage() -@@ -577,16 +577,15 @@ SweaveHooks <- function(options, run = FALSE, envir = .GlobalEnv) - } - do_exit <- - if(no.q) -- function(status = 1L) (if(status) stop else message)( -+ function(status = 0L) (if(status) stop else message)( - ".Stangle() exit status ", status) - else -- function(status = 1L) q("no", status = status, runLast = FALSE) -+ function(status = 0L) q("no", status = status, runLast = FALSE) - - if (!length(args)) { - Usage() - do_exit(1L) - } -- - file <- character() - encoding <- options <- "" - engine <- NULL |