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

RStudio: 1.4.1717 -> 2022.02.3+492 #177021

Merged
merged 3 commits into from
Jun 17, 2022
Merged

RStudio: 1.4.1717 -> 2022.02.3+492 #177021

merged 3 commits into from
Jun 17, 2022

Conversation

MrTarantoga
Copy link
Contributor

@MrTarantoga MrTarantoga commented Jun 9, 2022

Description of changes

The current RStudio version does not compile with the new nixos-22.05 branch. This is related to the gcc and R version increase.

Release Notes for 2022.02.3+492

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 22.11 Release Notes (or backporting 22.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

The old version does not compile with gcc11. Also the used nixos-22.05
libraries (R interpreter) have changed their interfaces that have to be
also patched. Updating RStudio is usefull.
@turion
Copy link
Contributor

turion commented Jun 17, 2022

@ofborg build rstudio

@turion
Copy link
Contributor

turion commented Jun 17, 2022

@ofborg test rstudio

@turion
Copy link
Contributor

turion commented Jun 17, 2022

@ofborg build rstudio.tests

Create explicit nix path replacement of hard coded FHS paths for pandoc and nodejs.
@MrTarantoga
Copy link
Contributor Author

@ofborg build rstudio

@MrTarantoga
Copy link
Contributor Author

@ofborg test rstudio

@MrTarantoga
Copy link
Contributor Author

@ofborg build rstudio.tests

@turion
Copy link
Contributor

turion commented Jun 17, 2022

Builds, and I can execute it without crash. Thanks a lot!

@turion turion merged commit 1f95c49 into NixOS:master Jun 17, 2022
@MrTarantoga
Copy link
Contributor Author

MrTarantoga commented Jun 17, 2022

@turion please can you explain how to make a backport to release-22.05? I do not know how to create a backport label, as mentioned in the documentation.

@turion
Copy link
Contributor

turion commented Jun 17, 2022

@MrTarantoga Sorry I didn't answer your question earlier. See https://nixos.org/manual/nixpkgs/stable/#submitting-changes-stable-release-branches. You can create a regular merge request onto release-22.05 and cherry-pick the commit.

But I'm not sure this should be backported since this is a big version change. Are you sure there are no breaking changes in RStudio between these two versions? And, is RStudio broken on 22.05? (If not I believe it's better not to backport.)

@MrTarantoga
Copy link
Contributor Author

@turion yes, RStudio is broken in 22.05. The used version is more than one year old and the same error occur on fedora and arch linux. As I mentioned in the Pull-Request, the build of the old version is not possible because of a stricter behaviour of gcc 11 an above:
See here

In file included from /nix/store/jxppx178fi32y7p52mkmrzvxyxm3xfca-glibc-2.34-210-dev/include/signal.h:328,
                 from /build/source/src/cpp/tests/cpp/tests/vendor/catch.hpp:8039,
                 from /build/source/src/cpp/tests/cpp/tests/TestMain.hpp:24,
                 from /build/source/src/cpp/tests/cpp/tests/TestMain.cpp:19:
/build/source/src/cpp/tests/cpp/tests/vendor/catch.hpp:10827:58: error: call to non-'constexpr' function 'long int sysconf(int)'
10827 |     static constexpr std::size_t sigStackSize = 32768 >= MINSIGSTKSZ ? 32768 : MINSIGSTKSZ;
      |                                                          ^~~~~~~~~~~
In file included from /nix/store/jxppx178fi32y7p52mkmrzvxyxm3xfca-glibc-2.34-210-dev/include/bits/sigstksz.h:24,
                 from /nix/store/jxppx178fi32y7p52mkmrzvxyxm3xfca-glibc-2.34-210-dev/include/signal.h:328,
                 from /build/source/src/cpp/tests/cpp/tests/vendor/catch.hpp:8039,
                 from /build/source/src/cpp/tests/cpp/tests/TestMain.hpp:24,
                 from /build/source/src/cpp/tests/cpp/tests/TestMain.cpp:19:
/nix/store/jxppx178fi32y7p52mkmrzvxyxm3xfca-glibc-2.34-210-dev/include/unistd.h:640:17: note: 'long int sysconf(int)' declared here
  640 | extern long int sysconf (int __name) __THROW;
      |                 ^~~~~~~
In file included from /build/source/src/cpp/tests/cpp/tests/TestMain.hpp:24,
                 from /build/source/src/cpp/tests/cpp/tests/TestMain.cpp:19:
/build/source/src/cpp/tests/cpp/tests/vendor/catch.hpp:10886:45: error: size of array 'altStackMem' is not an integral constant-expression
10886 |     char FatalConditionHandler::altStackMem[sigStackSize] = {};
      |                                             ^~~~~~~~~~~~
make[2]: *** [src/cpp/shared_core/CMakeFiles/rstudio-shared-core-tests.dir/build.make:76: src/cpp/shared_core/CMakeFiles/rstudio-shared-core-tests.dir/__/tests/cpp/tests/TestMain.cpp.o] Error 1
make[1]: *** [CMakeFiles/Makefile2:433: src/cpp/shared_core/CMakeFiles/rstudio-shared-core-tests.dir/all] Error 2
make: *** [Makefile:156: all] Error 2

Also R and its libraries changed in release-22.05 so there are additional errors which does not occur in the hydra build, but in my first attempt to fix it. So it is easier to upgrade the whole version.

I am using RStudio already on release-22.05 and tested it there mainly. It works as intended.

MrTarantoga added a commit to MrTarantoga/nixpkgs that referenced this pull request Jun 17, 2022
Follow review in
NixOS#177021 (review)

(cherry picked from commit c758d73)
@MrTarantoga
Copy link
Contributor Author

@turion Backport request opened in #178033

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants