Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

R: 3.6.3 --> 4.0.0 & update packages #86081

Merged
merged 3 commits into from May 1, 2020
Merged

R: 3.6.3 --> 4.0.0 & update packages #86081

merged 3 commits into from May 1, 2020

Conversation

jabranham
Copy link
Contributor

Motivation for this change

Upstream release. Needed to backport a fix for a test which should be removed next time R gets updated. @peti I also updated the packages from CRAN and bioconductor.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@jabranham jabranham requested a review from peti as a code owner April 26, 2020 21:22
@ofborg ofborg bot requested a review from timokau April 26, 2020 21:30
@bcdarwin
Copy link
Member

Commit looks OK.

1 package marked as broken and skipped:
spark

6 package failed to build:
python37Packages.rpy2 python38Packages.rpy2 rstudio rstudioWrapper sage sageWithDoc

I think rpy2 is already broken and sage is probably unrelated. Any idea about rstudio?

@jabranham
Copy link
Contributor Author

No, I'm not an Rstudio user so I'm not very familiar with it. Did you get an error message?

@bcdarwin
Copy link
Member

It seems like the major version bump may have introduced a breaking change to the R CPP API:

[53%] Building CXX object src/cpp/desktop/CMakeFiles/rstudio.dir/DesktopSubMenu.cpp.o
/build/source/src/cpp/r/session/REmbeddedPosix.cpp: In function 'void rstudio::r::session::runEmbeddedR(const rstudio::core::FilePath&, const rstudio::core::FilePath&, bool, bool, SA_TYPE, const rstudio::r::session::Callbacks&, rstudio::r::session::InternalCallbacks*)':
/build/source/src/cpp/r/session/REmbeddedPosix.cpp:107:8: error: 'struct structRstart' has no member named 'R_Slave'
  107 |    Rp->R_Slave = FALSE ;
      |

@jabranham
Copy link
Contributor Author

Thanks. I found rstudio/rstudio#6017 which seems geared towards fixing the issue but it was later reverted.

@bcdarwin
Copy link
Member

Can we just use fetchpatch to bring in this commit? (I don't see where it was reverted.)

@jabranham
Copy link
Contributor Author

Thanks, trying now. It was reverted here: rstudio/rstudio@8259949 and I'm using what seems to be the replacement: rstudio/rstudio@3fb2397

@jabranham
Copy link
Contributor Author

Rstudio compiled successfully so pushed here

@ofborg ofborg bot requested review from ehmry, ciil and changlinli April 29, 2020 00:35
@bcdarwin
Copy link
Member

Would you also update the comment to describe what this patch is for/when it can be removed? Otherwise looks good.

@jabranham
Rstudio: 1.2.5033 -> 1.2.5042
56be910 
Need the patch to backport a fix so Rstudio compiles against R 4.0.0
@jabranham
Copy link
Contributor Author

Done

@bcdarwin
Copy link
Member

@GrahamcOfBorg build rstudio rstudioWrapper

@peti peti self-assigned this Apr 29, 2020
peti
peti reviewed Apr 29, 2020
View reviewed changes
Copy link
Member

@peti peti left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Test builds are running at https://hydra.nixos.org/jobset/nixpkgs/r-updates.

@peti peti mentioned this pull request Apr 29, 2020
Merged
4 tasks
@jabranham
Copy link
Contributor Author

jabranham commented May 1, 2020 via email

ciil
ciil approved these changes May 1, 2020
View reviewed changes
Copy link
Member

@ciil ciil left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

RStudio build lgtm as well.

@peti peti merged commit 205e4df into NixOS:master May 1, 2020
@jabranham jabranham deleted the update-r branch May 3, 2020 12:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@peti peti peti left review comments

@bcdarwin bcdarwin bcdarwin approved these changes

@ciil ciil ciil approved these changes

@timokau timokau Awaiting requested review from timokau

@ehmry ehmry Awaiting requested review from ehmry

@changlinli changlinli Awaiting requested review from changlinli

Assignees

@peti peti

Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@jabranham @bcdarwin @peti @ciil