ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-11 15:27:20 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #11629 from michelk/R/update

Browse Source 
R: 3.2.2 -> 3.2.3
This commit is contained in:
Peter Simons 2015-12-11 14:28:38 +01:00
commit e5e7d1411d
2 changed files with 3 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/science/math/R/default.nix
View File

@ -6,11 +6,11 @@
}:
stdenv.mkDerivation rec {
name = "R-3.2.2";
name = "R-3.2.3";
src = fetchurl {
url = "http://cran.r-project.org/src/base/R-3/${name}.tar.gz";
sha256 = "07a6s865bjnh7w0fqsrkv1pva76w99v86w0w787qpdil87km54cw";
sha256 = "b93b7d878138279234160f007cb9b7f81b8a72c012a15566e9ec5395cfd9b6c1";
};
buildInputs = [ bzip2 gfortran libX11 libXmu libXt
@ -19,8 +19,7 @@ stdenv.mkDerivation rec {
which jdk openblas curl
];
patches = [ ./no-usr-local-search-paths.patch
./fix-tests-without-recommended-packages.patch ];
patches = [ ./no-usr-local-search-paths.patch ];
preConfigure = ''
configureFlagsArray=(

24
pkgs/applications/science/math/R/fix-tests-without-recommended-packages.patch
View File

@ -1,24 +0,0 @@
diff -Naur R-3.2.2-upstream/tests/reg-packages.R R-3.2.2/tests/reg-packages.R
--- R-3.2.2-upstream/tests/reg-packages.R 2015-08-05 17:45:05.000000000 -0430
+++ R-3.2.2/tests/reg-packages.R 2015-10-01 02:11:05.484992903 -0430
@@ -82,7 +82,8 @@
## pkgB tests an empty R directory
dir.create(file.path(pkgPath, "pkgB", "R"), recursive = TRUE,
showWarnings = FALSE)
-p.lis <- if("Matrix" %in% row.names(installed.packages(.Library)))
+matrixIsInstalled <- "Matrix" %in% row.names(installed.packages(.Library))
+p.lis <- if(matrixIsInstalled)
c("pkgA", "pkgB", "exNSS4") else "exNSS4"
for(p. in p.lis) {
cat("building package", p., "...\n")
@@ -111,8 +112,8 @@
tools::assertError(is.null(pkgA:::nilData))
}
-if(dir.exists(file.path("myLib", "exNSS4"))) {
- for(ns in c("pkgB", "pkgA", "Matrix", "exNSS4")) unloadNamespace(ns)
+if(matrixIsInstalled && dir.exists(file.path("myLib", "exNSS4"))) {
+ for(ns in c(rev(p.lis), "Matrix")) unloadNamespace(ns)
## Both exNSS4 and Matrix define "atomicVector" *the same*,
## but 'exNSS4' has it extended - and hence *both* are registered in cache -> "conflicts"
requireNamespace("exNSS4", lib= "myLib")