diff options
| author | Justin Bedő <cu@cua0.org> | 2024-06-20 16:48:18 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-20 16:48:18 +1000 |
| commit | e7d6f2fd25ccfde2eed9fb2510e9ecde341d30a9 (patch) | |
| tree | 39c44dcb1728acf0dddd9bcac089cdee80cc328c /pkgs/applications/science/math | |
| parent | 8c811054a5b5d48945673684068c9abbc0ebdab9 (diff) | |
| parent | 6f3340bf0f888d0fda9a3b91dd5b3a9b05d08212 (diff) | |
| download | nixlib-e7d6f2fd25ccfde2eed9fb2510e9ecde341d30a9.tar nixlib-e7d6f2fd25ccfde2eed9fb2510e9ecde341d30a9.tar.gz nixlib-e7d6f2fd25ccfde2eed9fb2510e9ecde341d30a9.tar.bz2 nixlib-e7d6f2fd25ccfde2eed9fb2510e9ecde341d30a9.tar.lz nixlib-e7d6f2fd25ccfde2eed9fb2510e9ecde341d30a9.tar.xz nixlib-e7d6f2fd25ccfde2eed9fb2510e9ecde341d30a9.tar.zst nixlib-e7d6f2fd25ccfde2eed9fb2510e9ecde341d30a9.zip | |
Merge pull request #315015 from NixOS/r-updates
rPackages, R: R 4.3.3 -> 4.4.1 and bump rPackages
Diffstat (limited to 'pkgs/applications/science/math')
| -rw-r--r-- | pkgs/applications/science/math/R/default.nix | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index 5ceb413a2421..b6fac3cca9e5 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -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 , less, texinfo, graphviz, icu, pkg-config, bison, imake, which, jdk, blas, lapack , curl, Cocoa, Foundation, libobjc, libcxx, tzdata @@ -15,13 +15,13 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation (finalAttrs: { pname = "R"; - version = "4.3.3"; + version = "4.4.1"; src = let inherit (finalAttrs) pname version; in fetchurl { url = "https://cran.r-project.org/src/base/R-${lib.versions.major version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-gIUSMTk7hb84d+6eObKC51Dthkxexgy9aObhOfBSAzA="; + sha256 = "sha256-tMtnXequtymdOyZdIYzeQ/GSlRzluJt7saUUijay2U0="; }; outputs = [ "out" "tex" ]; @@ -37,12 +37,6 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./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: |