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

R: 4.1.0 -> 4.1.1

Browse Source
This commit is contained in:
Phil Dyer 2021-08-11 16:41:53 +10:00
parent 9a88197fe7
commit d37edcd3d5
1 changed files with 2 additions and 15 deletions

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

@ -13,11 +13,11 @@ assert (!blas.isILP64) && (!lapack.isILP64);
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "R"; pname = "R";
version = "4.1.0"; version = "4.1.1";
src = fetchurl { src = fetchurl {
url = "https://cran.r-project.org/src/base/R-${lib.versions.major version}/${pname}-${version}.tar.gz"; url = "https://cran.r-project.org/src/base/R-${lib.versions.major version}/${pname}-${version}.tar.gz";
sha256 = "109732arm6dq6d6v3fl1nyx63lcvv9569j8g6r3s2b18sxcqkrp8"; sha256 = "0r6kpnxjbvb7gdfg4m1z8zc6xd225vw81wrnf05ps9ajawk06pji";
}; };
dontUseImakeConfigure = true; dontUseImakeConfigure = true;
@ -30,19 +30,6 @@ stdenv.mkDerivation rec {
patches = [ patches = [
./no-usr-local-search-paths.patch ./no-usr-local-search-paths.patch
] ++ lib.optionals (!withRecommendedPackages) [
(fetchpatch {
name = "fix-tests-without-recommended-packages.patch";
url = "https://github.com/wch/r-source/commit/7715c67cabe13bb15350cba1a78591bbb76c7bac.patch";
# this part of the patch reverts something that was committed after R 4.1.0, so ignore it.
excludes = [ "tests/Pkgs/xDir/pkg/DESCRIPTION" ];
sha256 = "sha256-iguLndCIuKuCxVCi/4NSu+9RzBx5JyeHx3K6IhpYshQ=";
})
(fetchpatch {
name = "use-codetools-conditionally.patch";
url = "https://github.com/wch/r-source/commit/7543c28b931db386bb254e58995973493f88e30d.patch";
sha256 = "sha256-+yHXB5AItFyQjSxfogxk72DrSDGiBh7OiLYFxou6Xlk=";
})
]; ];
prePatch = lib.optionalString stdenv.isDarwin '' prePatch = lib.optionalString stdenv.isDarwin ''