MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 23:03:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

RStudio: 2022.02.3+492 -> 2022.07.1.+554 (#185154)

Browse source 
RStudio: 2022.02.3+492 -> 2022.07.1.+554

Separate quarto fix and pandoc installation
This commit is contained in:
Goetz 2022-09-20 11:24:19 +02:00 committed by GitHub
parent 453315b3e1
commit f76ab1db42
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 65 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/applications/editors/rstudio/clang-location.patch
View file

@ -1,8 +1,6 @@
diff --git a/src/cpp/core/libclang/LibClang.cpp b/src/cpp/core/libclang/LibClang.cpp
index 1186f3a..58e8cc7 100644
--- a/src/cpp/core/libclang/LibClang.cpp
+++ b/src/cpp/core/libclang/LibClang.cpp
@@ -58,7 +58,7 @@ std::vector<std::string> defaultCompileArgs(LibraryVersion version)
@@ -62,7 +62,7 @@
// we need to add in the associated libclang headers as
// they are not discovered / used by default during compilation
@ -11,7 +9,7 @@ index 1186f3a..58e8cc7 100644
boost::format fmt("%1%/lib/clang/%2%/include");
fmt % llvmPath.getAbsolutePath() % version.asString();
std::string includePath = fmt.str();
@@ -70,46 +70,7 @@ std::vector<std::string> defaultCompileArgs(LibraryVersion version)
@@ -74,47 +74,7 @@
std::vector<std::string> systemClangVersions()
{
@ -55,7 +53,9 @@ index 1186f3a..58e8cc7 100644
- }
-#endif
-
+ std::vector<std::string> clangVersions = { "@libclang.so@" };
return clangVersions;
- return clangVersions;
+ return std::vector<std::string> { "@libclang.so@" };
}

13
pkgs/applications/editors/rstudio/default.nix
View file

@ -39,17 +39,17 @@
let
pname = "RStudio";
version = "2022.02.3+492";
version = "2022.07.1+554";
RSTUDIO_VERSION_MAJOR = "2022";
RSTUDIO_VERSION_MINOR = "02";
RSTUDIO_VERSION_PATCH = "3";
RSTUDIO_VERSION_SUFFIX = "+492";
RSTUDIO_VERSION_MINOR = "07";
RSTUDIO_VERSION_PATCH = "1";
RSTUDIO_VERSION_SUFFIX = "+554";
src = fetchFromGitHub {
owner = "rstudio";
repo = "rstudio";
rev = "v${version}";
sha256 = "1pgbk5rpy47h9ihdrplbfhfc49hrc6242j9099bclq7rqif049wi";
sha256 = "0rmdqxizxqg2vgr3lv066cjmlpjrxjlgi0m97wbh6iyhkfm2rrj1";
};
mathJaxSrc = fetchurl {
@ -129,6 +129,8 @@ in
./use-system-node.patch
./fix-resources-path.patch
./pandoc-nix-path.patch
./remove-quarto-from-generator.patch
./do-not-install-pandoc.patch
];
postPatch = ''
@ -196,7 +198,6 @@ in
done
rm -r $out/lib/rstudio/{INSTALL,COPYING,NOTICE,README.md,SOURCE,VERSION}
rm -r $out/lib/rstudio/bin/{pandoc/pandoc,pandoc}
'';
meta = with lib; {

13
pkgs/applications/editors/rstudio/do-not-install-pandoc.patch Normal file
View file

@ -0,0 +1,13 @@
--- a/src/cpp/session/CMakeLists.txt
+++ b/src/cpp/session/CMakeLists.txt
@@ -60,8 +60,7 @@
# validate our dependencies exist
foreach(VAR RSTUDIO_DEPENDENCIES_DICTIONARIES_DIR
- RSTUDIO_DEPENDENCIES_MATHJAX_DIR
- RSTUDIO_DEPENDENCIES_PANDOC_DIR)
+ RSTUDIO_DEPENDENCIES_MATHJAX_DIR)
# validate existence
if(NOT EXISTS "${${VAR}}")

32
pkgs/applications/editors/rstudio/remove-quarto-from-generator.patch Normal file
View file

@ -0,0 +1,32 @@
--- a/src/cpp/session/CMakeLists.txt
+++ b/src/cpp/session/CMakeLists.txt
@@ -43,12 +43,6 @@
set(RSTUDIO_DEPENDENCIES_MATHJAX_DIR "${RSTUDIO_DEPENDENCIES_DIR}/mathjax-27")
endif()
- if(EXISTS "${RSTUDIO_TOOLS_ROOT}/quarto")
- set(RSTUDIO_DEPENDENCIES_QUARTO_DIR "${RSTUDIO_TOOLS_ROOT}/quarto")
- else()
- set(RSTUDIO_DEPENDENCIES_QUARTO_DIR "${RSTUDIO_DEPENDENCIES_DIR}/quarto")
- endif()
-
endif()
@@ -67,14 +61,7 @@
# validate our dependencies exist
foreach(VAR RSTUDIO_DEPENDENCIES_DICTIONARIES_DIR
RSTUDIO_DEPENDENCIES_MATHJAX_DIR
- RSTUDIO_DEPENDENCIES_PANDOC_DIR
- RSTUDIO_DEPENDENCIES_QUARTO_DIR)
-
-
- # skip quarto if not enabled
- if("${VAR}" STREQUAL "RSTUDIO_DEPENDENCIES_QUARTO_DIR" AND NOT QUARTO_ENABLED)
- continue()
- endif()
+ RSTUDIO_DEPENDENCIES_PANDOC_DIR)
# validate existence
if(NOT EXISTS "${${VAR}}")

13
pkgs/applications/editors/rstudio/use-system-node.patch
View file

@ -1,11 +1,12 @@
--- a/src/gwt/build.xml
+++ b/src/gwt/build.xml
@@ -84,23 +84,7 @@
@@ -83,24 +83,7 @@
<echo>Concatenated acesupport files to 'acesupport.js'</echo>
</target>
<!-- panmirror typescript library -->
- <!-- panmirror typescript library -->
- <!-- ensure version matches RSTUDIO_NODE_VERSION -->
- <property name="node.version" value="14.17.5"/>
- <property name="node.version" value="16.14.0"/>
- <property name="node.dir" value="../../dependencies/common/node/${node.version}"/>
- <condition property="node.bin" value="../../../${node.dir}/bin/node">
- <not>
@ -21,8 +22,8 @@
- 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"/>
+ <property name="node.bin" value="@node@/bin/node"/>
+ <property name="node.bin" value="@node@/bin/node"/>
<property name="panmirror.dir" value="./panmirror/src/editor"/>
<property name="panmirror.build.dir" value="./www/js/panmirror"/>