Skip to content

Comments

rstudio{,-server}: 2024.12.1+563 -> 2025.05.0+496#405315

Merged
TomaSajt merged 1 commit intoNixOS:masterfrom
TomaSajt:rstudio-mariposa-orchid
May 26, 2025
Merged

rstudio{,-server}: 2024.12.1+563 -> 2025.05.0+496#405315
TomaSajt merged 1 commit intoNixOS:masterfrom
TomaSajt:rstudio-mariposa-orchid

Conversation

@TomaSajt
Copy link
Contributor

@TomaSajt TomaSajt commented May 8, 2025

Main changes is this PR:

  • remove patches that are no longer needed
  • add extSrcs
    • upstream unvendored a lot of dependencies in this release
    • FetchContent_Declare and FetchContent_MakeAvailable are used for fetching those dependencies now
    • In extSrcs we treat the file that fetches all the external dependencies as a cmake entrypoint. This causes cmake to fail, but still fetches the dependencies.
  • categorize and sort dependencies
    • categorize by role (helper / buildtime / runtime)
    • sort alphabetically (except in nativeBuildInputs)
  • put env vars into env = {}
  • make nixos test conditional on linux, so hopefully ofborg actually tries to build rstudio
  • add changelog

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • 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/)
  • 25.05 Release Notes (or backporting 24.11 and 25.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
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@TomaSajt TomaSajt requested a review from b-rodrigues May 8, 2025 18:08
@github-actions github-actions bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels May 8, 2025
@nix-owners nix-owners bot requested a review from ciil May 8, 2025 18:17
Copy link
Contributor

@b-rodrigues b-rodrigues left a comment

Choose a reason for hiding this comment

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

tested the desktop version on x86-linux and aarch64-darwin, working flawlessly!

@TomaSajt
Copy link
Contributor Author

TomaSajt commented May 9, 2025

I still have to figure out where ofborg might be failing...

Copy link
Contributor

@Kupac Kupac left a comment

Choose a reason for hiding this comment

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

The server seems to be fully functional on x86_64-linux.

image

@wegank wegank added the 12.approvals: 2 This PR was reviewed and approved by two persons. label May 9, 2025
@TomaSajt
Copy link
Contributor Author

Looks like rstudio/rstudio@e475dba broke quarto installation of rstudio-server on darwin.

Will try to contact upstream about it.

@TomaSajt TomaSajt force-pushed the rstudio-mariposa-orchid branch from 162c0ed to eec72f9 Compare May 12, 2025 22:37
@TomaSajt
Copy link
Contributor Author

Okay, I just disabled the rstudio-server build on darwin. One guy upstream said that only the electron app is supposed to be built on darwin anyways.

(Btw I tested the older version's rstudio-server (which still built), and it is very broken (many paths are wrong) in the rstudio-server launch script)

@TomaSajt TomaSajt force-pushed the rstudio-mariposa-orchid branch from eec72f9 to cd6a92d Compare May 24, 2025 10:37
@github-actions github-actions bot added the 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. label May 24, 2025
@TomaSajt TomaSajt merged commit ece25c2 into NixOS:master May 26, 2025
17 of 18 checks passed
@TomaSajt TomaSajt deleted the rstudio-mariposa-orchid branch June 19, 2025 08:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 12.approvals: 2 This PR was reviewed and approved by two persons.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants