public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

R: 3.6.0 -> 3.6.1

Browse Source
This commit is contained in:
Peter Simons 2019-07-05 10:46:12 +02:00
parent 6fdd315178
commit ec662c5654
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,11 +8,11 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "R-3.6.0"; name = "R-3.6.1";
src = fetchurl { src = fetchurl {
url = "https://cran.r-project.org/src/base/R-3/${name}.tar.gz"; url = "https://cran.r-project.org/src/base/R-3/${name}.tar.gz";
sha256 = "02bmylmzrm9sdidirmwy233lghmd2346z725ca71ari68lzarz1n"; sha256 = "128kifbq0w25y8aq77w289ddax5i5w2djcfsqgffrb3i7syrxajv";
}; };
dontUseImakeConfigure = true; dontUseImakeConfigure = true;
@ -27,10 +27,6 @@ stdenv.mkDerivation rec {
patches = [ patches = [
./no-usr-local-search-paths.patch ./no-usr-local-search-paths.patch
(fetchpatch {
url = "https://github.com/wch/r-source/commit/aeb75e12863019be06fe6c762ab705bf5ed8b38c.patch";
sha256 = "03xv1g1yw1dbhx4paw6pn6hkawj8sny86km3748l1vnasbham82g";
})
]; ];
prePatch = stdenv.lib.optionalString stdenv.isDarwin '' prePatch = stdenv.lib.optionalString stdenv.isDarwin ''