diff options
| author | Ricardo Wurmus <rekado@elephly.net> | 2026-03-09 14:47:59 +0100 |
|---|---|---|
| committer | Ricardo Wurmus <rekado@elephly.net> | 2026-03-16 11:11:37 +0100 |
| commit | 9ae43360bb0bd018d4b0a2a6997b6953ff94d814 (patch) | |
| tree | c2b7ffea6295f7f96de1dbfceeb69a8667de5cb0 /patches/rstudio-server-install.patch | |
| parent | 0cba59f29e1adb47e3b4cca4ec70b0f80fe0e180 (diff) | |
gnu: rstudio-server: Update to 2024.12.1+563.
* guix-science/packages/rstudio.scm (rstudio-server): Update to
2024.12.1+563.
[arguments]: Adjust patches.
* patches/rstudio-server-install.patch: New file.
* patches/rstudio-server-panmirror.patch: New file.
* patches/rstudio-server-multi-version/0001-handleClientInit-Store-R-versions-in-sessionInfo.patch,
patches/rstudio-server-multi-version/0002-launchAndTrackSession-Configure-R-version-from-activ.patch,
patches/rstudio-server-multi-version/0003-NewProjectWizard-Unhide-version-selector-widget.patch,
patches/rstudio-server-multi-version/0004-handleConnection-Switch-R-version-when-switching-pro.patch,
patches/rstudio-server-multi-version/0005-Add-version-switcher-widget-to-toolbar.patch,
patches/rstudio-server-multi-version/0006-Look-at-.local-share-rstudio-r-versions-for-custom-R.patch,
patches/rstudio-server-multi-version/0007-detectRLocationsUsingR-Restore-R_HOME-at-the-end.patch:
Port to latest version.
Diffstat (limited to 'patches/rstudio-server-install.patch')
| -rw-r--r-- | patches/rstudio-server-install.patch | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/patches/rstudio-server-install.patch b/patches/rstudio-server-install.patch index 3427403..56b8616 100644 --- a/patches/rstudio-server-install.patch +++ b/patches/rstudio-server-install.patch | |||
| @@ -21,18 +21,18 @@ Avoid copying all of mathjax, pandoc, and node to the output. | |||
| 21 | 21 | ||
| 22 | # install embedded packages | 22 | # install embedded packages |
| 23 | 23 | ||
| 24 | --- a/src/cpp/server/CMakeLists.txt | 24 | --- a/src/cpp/session/CMakeLists.txt |
| 25 | +++ b/src/cpp/server/CMakeLists.txt | 25 | +++ b/src/cpp/session/CMakeLists.txt |
| 26 | @@ -250,12 +250,6 @@ | 26 | @@ -712,12 +712,6 @@ |
| 27 | install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_SYSTEMD_PROFILE_REDHAT} | 27 | DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources") |
| 28 | DESTINATION ${RSERVER_SYSTEMD_DIR}) | 28 | |
| 29 | 29 | ||
| 30 | - # install node | 30 | - # install node |
| 31 | - install( | 31 | - install( |
| 32 | - DIRECTORY "${RSTUDIO_DEPENDENCIES_DIR}/common/node/${RSTUDIO_NODE_VERSION}/" | 32 | - DIRECTORY "${RSTUDIO_DEPENDENCIES_DIR}/common/node/${RSTUDIO_INSTALLED_NODE_VERSION}-patched/" |
| 33 | - DESTINATION "${RSTUDIO_INSTALL_BIN}/node" | 33 | - DESTINATION "${RSTUDIO_INSTALL_BIN}/node" |
| 34 | - USE_SOURCE_PERMISSIONS) | 34 | - USE_SOURCE_PERMISSIONS) |
| 35 | - | 35 | - |
| 36 | elseif(APPLE) | 36 | # install quarto (or pandoc if quarto disabled) |
| 37 | 37 | if(QUARTO_ENABLED) | |
| 38 | # install configured admin script | 38 | # install some quarto folders into Resources, as needed |
