nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-09 15:23:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
21e47482a1
nixpkgs/pkgs/applications/editors/rstudio/pandoc-nix-path.patch

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

19 lines
602 B
Diff
Raw Normal View History

RStudio: 1.4.1717 -> 2022.02.3+492 (#177021) rstudio: 1.4.1717 -> 2022.02.3+492 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 useful. * Remove Quarto patch Follow review in https://github.com/NixOS/nixpkgs/pull/177021#pullrequestreview-1007625773 * Fix not FHS paths Create explicit nix path replacement of hard coded FHS paths for pandoc and nodejs.
2022-06-17 14:08:22 +00:00
--- a/src/cpp/session/include/session/SessionConstants.hpp
+++ b/src/cpp/session/include/session/SessionConstants.hpp
rstudio: 2022.07.1+554 -> 2023.09.0+463 Updates rstudio to current version, fixes plotting and enables quarto and markdown rendering. Visual mode for markdown editing is still not functional. * Remove unneeded patch * Eliminate false quarto version warning * Fix pandoc and quarto paths * Adjust patch name to reflect purpose * Remove panmirror for now * Update quartoSrc Co-authored-by: Justin Bedő <cu@cua0.org> Also contributed: b-rodrigues and kupac
2023-09-20 20:21:32 +00:00
@@ -142,13 +142,13 @@
#define kSessionTmpDir "rstudio-rsession"
RStudio: 1.4.1717 -> 2022.02.3+492 (#177021) rstudio: 1.4.1717 -> 2022.02.3+492 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 useful. * Remove Quarto patch Follow review in https://github.com/NixOS/nixpkgs/pull/177021#pullrequestreview-1007625773 * Fix not FHS paths Create explicit nix path replacement of hard coded FHS paths for pandoc and nodejs.
2022-06-17 14:08:22 +00:00
#ifdef QUARTO_ENABLED
rstudio: 2022.07.1+554 -> 2023.09.0+463 Updates rstudio to current version, fixes plotting and enables quarto and markdown rendering. Visual mode for markdown editing is still not functional. * Remove unneeded patch * Eliminate false quarto version warning * Fix pandoc and quarto paths * Adjust patch name to reflect purpose * Remove panmirror for now * Update quartoSrc Co-authored-by: Justin Bedő <cu@cua0.org> Also contributed: b-rodrigues and kupac
2023-09-20 20:21:32 +00:00
-# define kDefaultPandocPath "bin/quarto/bin/tools"
RStudio: 1.4.1717 -> 2022.02.3+492 (#177021) rstudio: 1.4.1717 -> 2022.02.3+492 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 useful. * Remove Quarto patch Follow review in https://github.com/NixOS/nixpkgs/pull/177021#pullrequestreview-1007625773 * Fix not FHS paths Create explicit nix path replacement of hard coded FHS paths for pandoc and nodejs.
2022-06-17 14:08:22 +00:00
+# define kDefaultPandocPath "@pandoc@"
rstudio: 2022.07.1+554 -> 2023.09.0+463 Updates rstudio to current version, fixes plotting and enables quarto and markdown rendering. Visual mode for markdown editing is still not functional. * Remove unneeded patch * Eliminate false quarto version warning * Fix pandoc and quarto paths * Adjust patch name to reflect purpose * Remove panmirror for now * Update quartoSrc Co-authored-by: Justin Bedő <cu@cua0.org> Also contributed: b-rodrigues and kupac
2023-09-20 20:21:32 +00:00
#else
# define kDefaultPandocPath "bin/pandoc"
RStudio: 1.4.1717 -> 2022.02.3+492 (#177021) rstudio: 1.4.1717 -> 2022.02.3+492 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 useful. * Remove Quarto patch Follow review in https://github.com/NixOS/nixpkgs/pull/177021#pullrequestreview-1007625773 * Fix not FHS paths Create explicit nix path replacement of hard coded FHS paths for pandoc and nodejs.
2022-06-17 14:08:22 +00:00
#endif
rstudio: 2022.07.1+554 -> 2023.09.0+463 Updates rstudio to current version, fixes plotting and enables quarto and markdown rendering. Visual mode for markdown editing is still not functional. * Remove unneeded patch * Eliminate false quarto version warning * Fix pandoc and quarto paths * Adjust patch name to reflect purpose * Remove panmirror for now * Update quartoSrc Co-authored-by: Justin Bedő <cu@cua0.org> Also contributed: b-rodrigues and kupac
2023-09-20 20:21:32 +00:00
#define kDefaultNodePath "bin/node"
-#define kDefaultQuartoPath "bin/quarto"
+#define kDefaultQuartoPath "@quarto@"
#define kDefaultRsclangPath "bin/rsclang"
#ifdef _WIN32
Reference in New Issue Copy Permalink