tjh.dev / nixpkgs
nixpkgs mirror (for testing) github.com/NixOS/nixpkgs
nix
fork atom

R: 4.2.1 -> 4.2.2

Justin Bedo 4d394bfb 037e57cb

+3 -19
+2 -3
pkgs/applications/science/math/R/default.nix
··· 14 14 15 15 stdenv.mkDerivation rec { 16 16 pname = "R"; 17 - version = "4.2.1"; 17 + version = "4.2.2"; 18 18 19 19 src = fetchurl { 20 20 url = "https://cran.r-project.org/src/base/R-${lib.versions.major version}/${pname}-${version}.tar.gz"; 21 - sha256 = "sha256-TVLbSG0nhI5UYT1O6XetlS7AjOF4B+G1JbEM1ENsZD8="; 21 + sha256 = "sha256-D/YrQuxRr6VxPK7nxP3noMRZQLo5vvjFyUh/7wyVPfU="; 22 22 }; 23 23 24 24 dontUseImakeConfigure = true; ··· 32 32 33 33 patches = [ 34 34 ./no-usr-local-search-paths.patch 35 - ./test-reg-packages.patch 36 35 ]; 37 36 38 37 # Test of the examples for package 'tcltk' fails in Darwin sandbox. See:
-15
pkgs/applications/science/math/R/test-reg-packages.patch
··· 1 - Upper bounds shifts due to extra warnings re. internet connectivity. 2 - 3 - diff --git a/tests/reg-packages.R b/tests/reg-packages.R 4 - index c9962ce..a40b0fa 100644 5 - --- a/tests/reg-packages.R 6 - +++ b/tests/reg-packages.R 7 - @@ -260,7 +260,7 @@ stopifnot(exprs = { 8 - (lenN <- length(print(iN <- grep("^[1-9][0-9]:", tlines)))) >= 2 9 - iN - iw == seq_len(lenN) # these (3) lines come immediately after 'Warning', 10 - ## and "related" to the some 'missing .. paren' above: 11 - - 8 <= print(iw - i) & iw - i <= 20 # see ~14 12 - + 8 <= print(iw - i) & iw - i <= 22 # see ~14 13 - }) ## failed in R <= 4.1.1 14 - 15 -
+1 -1
pkgs/top-level/all-packages.nix
··· 23530 23530 R = callPackage ../applications/science/math/R { 23531 23531 # TODO: split docs into a separate output 23532 23532 texLive = texlive.combine { 23533 - inherit (texlive) scheme-small inconsolata helvetic texinfo fancyvrb cm-super; 23533 + inherit (texlive) scheme-small inconsolata helvetic texinfo fancyvrb cm-super rsfs; 23534 23534 }; 23535 23535 withRecommendedPackages = false; 23536 23536 inherit (darwin.apple_sdk.frameworks) Cocoa Foundation;