nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-30 17:43:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
8761a0f731
nixpkgs/pkgs/applications/editors/rstudio/use-system-node.patch

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

30 lines
1.1 KiB
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/gwt/build.xml
+++ b/src/gwt/build.xml
RStudio: 2022.02.3+492 -> 2022.07.1.+554 (#185154) RStudio: 2022.02.3+492 -> 2022.07.1.+554 Separate quarto fix and pandoc installation
2022-09-20 09:24:19 +00:00
@@ -83,24 +83,7 @@
<echo>Concatenated acesupport files to 'acesupport.js'</echo>
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
</target>
RStudio: 2022.02.3+492 -> 2022.07.1.+554 (#185154) RStudio: 2022.02.3+492 -> 2022.07.1.+554 Separate quarto fix and pandoc installation
2022-09-20 09:24:19 +00:00
- <!-- panmirror typescript library -->
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
- <!-- ensure version matches RSTUDIO_NODE_VERSION -->
RStudio: 2022.02.3+492 -> 2022.07.1.+554 (#185154) RStudio: 2022.02.3+492 -> 2022.07.1.+554 Separate quarto fix and pandoc installation
2022-09-20 09:24:19 +00:00
- <property name="node.version" value="16.14.0"/>
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
- <property name="node.dir" value="../../dependencies/common/node/${node.version}"/>
- <condition property="node.bin" value="../../../${node.dir}/bin/node">
- <not>
- <os family="windows" />
- </not>
- </condition>
- <condition property="node.bin" value="${node.dir}/node.exe">
- <os family="windows" />
- </condition>
-
- <!-- use node from /opt/rstudio-tools if installed (typical for Docker) -->
- <available
- property="node.bin"
- value="/opt/rstudio-tools/dependencies/common/node/${node.version}/bin/node"
- file="/opt/rstudio-tools/dependencies/common/node/${node.version}/bin/node"/>
RStudio: 2022.02.3+492 -> 2022.07.1.+554 (#185154) RStudio: 2022.02.3+492 -> 2022.07.1.+554 Separate quarto fix and pandoc installation
2022-09-20 09:24:19 +00:00
+ <property name="node.bin" value="@node@/bin/node"/>
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
<property name="panmirror.dir" value="./panmirror/src/editor"/>
<property name="panmirror.build.dir" value="./www/js/panmirror"/>
Reference in New Issue Copy Permalink