mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-01 17:53:14 +00:00
R: 4.3.3 -> 4.4.0
This commit is contained in:
parent
9ca3f64961
commit
abbbac6070
@ -1,4 +1,4 @@
|
|||||||
{ lib, stdenv, fetchurl, fetchpatch, bzip2, gfortran, libX11, libXmu, libXt, libjpeg, libpng
|
{ lib, stdenv, fetchurl, bzip2, gfortran, libX11, libXmu, libXt, libjpeg, libpng
|
||||||
, libtiff, ncurses, pango, pcre2, perl, readline, tcl, texlive, texliveSmall, tk, xz, zlib
|
, libtiff, ncurses, pango, pcre2, perl, readline, tcl, texlive, texliveSmall, tk, xz, zlib
|
||||||
, less, texinfo, graphviz, icu, pkg-config, bison, imake, which, jdk, blas, lapack
|
, less, texinfo, graphviz, icu, pkg-config, bison, imake, which, jdk, blas, lapack
|
||||||
, curl, Cocoa, Foundation, libobjc, libcxx, tzdata
|
, curl, Cocoa, Foundation, libobjc, libcxx, tzdata
|
||||||
@ -15,13 +15,13 @@ assert (!blas.isILP64) && (!lapack.isILP64);
|
|||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "R";
|
pname = "R";
|
||||||
version = "4.3.3";
|
version = "4.4.0";
|
||||||
|
|
||||||
src = let
|
src = let
|
||||||
inherit (finalAttrs) pname version;
|
inherit (finalAttrs) pname version;
|
||||||
in fetchurl {
|
in 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 = "sha256-gIUSMTk7hb84d+6eObKC51Dthkxexgy9aObhOfBSAzA=";
|
sha256 = "sha256-rOQSX5uXbSxTvMX8owx14w1O3EAVhIWcutsIDnK18DA=";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = [ "out" "tex" ];
|
outputs = [ "out" "tex" ];
|
||||||
@ -37,12 +37,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
./no-usr-local-search-paths.patch
|
./no-usr-local-search-paths.patch
|
||||||
(fetchpatch {
|
|
||||||
# https://hiddenlayer.com/research/r-bitrary-code-execution/
|
|
||||||
name = "CVE-2024-27322.patch";
|
|
||||||
url = "https://github.com/r-devel/r-svn/commit/f7c46500f455eb4edfc3656c3fa20af61b16abb7.patch";
|
|
||||||
hash = "sha256-CH2mMmie9E96JeGSC7UGm7/roUNhK5xv6HO53N2ixEI=";
|
|
||||||
})
|
|
||||||
];
|
];
|
||||||
|
|
||||||
# Test of the examples for package 'tcltk' fails in Darwin sandbox. See:
|
# Test of the examples for package 'tcltk' fails in Darwin sandbox. See:
|
||||||
|
Loading…
Reference in New Issue
Block a user