about summary refs log tree commit diff
path: root/pkgs/applications/science/math/R/default.nix
diff options
context:
space:
mode:
authorJustin Bedo <cu@cua0.org>2022-04-26 11:27:16 +1000
committerJustin Bedo <cu@cua0.org>2022-04-27 09:55:00 +1000
commit5eb9f35c44d30153ff1df2105ed73e148a79a3ee (patch)
tree82f6f8a586542b32c3c76b1c75404b67dc856299 /pkgs/applications/science/math/R/default.nix
parent602748c14b82a2e17078713686fe1df2824fa502 (diff)
R: 4.1.3 -> 4.2.0
Patch needed to past test, as there are extra warnings
in a sandbox build due to lack of internet access.
x
Diffstat (limited to 'pkgs/applications/science/math/R/default.nix')
-rw-r--r--pkgs/applications/science/math/R/default.nix7
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix
index f91d72ff3f635..d1b1199686f63 100644
--- a/pkgs/applications/science/math/R/default.nix
+++ b/pkgs/applications/science/math/R/default.nix
@@ -14,11 +14,11 @@ assert (!blas.isILP64) && (!lapack.isILP64);
 
 stdenv.mkDerivation rec {
   pname = "R";
-  version = "4.1.3";
+  version = "4.2.0";
 
   src = fetchurl {
     url = "https://cran.r-project.org/src/base/R-${lib.versions.major version}/${pname}-${version}.tar.gz";
-    sha256 = "sha256-Ff9bMzxhCUBgsqUunB2OxVzELdAp45yiKr2qkJUm/tY=";
+    sha256 = "sha256-OOq3cZt60JU4jwaqCQxaKyAnkZRd5g0+K7DqsfUJdIg=";
   };
 
   dontUseImakeConfigure = true;
@@ -31,6 +31,7 @@ stdenv.mkDerivation rec {
 
   patches = [
     ./no-usr-local-search-paths.patch
+    ./test-reg-packages.patch
   ];
 
   # Test of the examples for package 'tcltk' fails in Darwin sandbox. See:
@@ -90,7 +91,7 @@ stdenv.mkDerivation rec {
   postFixup = "echo ${which} > $out/nix-support/undetected-runtime-dependencies";
 
   doCheck = true;
-  preCheck = "export TZ=CET; bin/Rscript -e 'sessionInfo()'";
+  preCheck = "export HOME=$TMPDIR; export TZ=CET; bin/Rscript -e 'sessionInfo()'";
 
   enableParallelBuilding = true;