pyrox.dev / nixpkgs
lol
fork atom

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

authored by

Goetz and committed by
GitHub f76ab1db 453315b3

+65 -18
unified split
+6 -6
pkgs/applications/editors/rstudio/clang-location.patch
··· 1 - diff --git a/src/cpp/core/libclang/LibClang.cpp b/src/cpp/core/libclang/LibClang.cpp 2 - index 1186f3a..58e8cc7 100644 3 1 --- a/src/cpp/core/libclang/LibClang.cpp 4 2 +++ b/src/cpp/core/libclang/LibClang.cpp 5 - @@ -58,7 +58,7 @@ std::vector<std::string> defaultCompileArgs(LibraryVersion version) 3 + @@ -62,7 +62,7 @@ 6 4 7 5 // we need to add in the associated libclang headers as 8 6 // they are not discovered / used by default during compilation ··· 11 9 boost::format fmt("%1%/lib/clang/%2%/include"); 12 10 fmt % llvmPath.getAbsolutePath() % version.asString(); 13 11 std::string includePath = fmt.str(); 14 - @@ -70,46 +70,7 @@ std::vector<std::string> defaultCompileArgs(LibraryVersion version) 12 + @@ -74,47 +74,7 @@ 15 13 16 14 std::vector<std::string> systemClangVersions() 17 15 { ··· 55 53 - } 56 54 -#endif 57 55 - 58 - + std::vector<std::string> clangVersions = { "@libclang.so@" }; 59 - return clangVersions; 56 + - return clangVersions; 57 + + return std::vector<std::string> { "@libclang.so@" }; 60 58 } 59 + 60 + 61 61
+7 -6
pkgs/applications/editors/rstudio/default.nix
··· 39 39 40 40 let 41 41 pname = "RStudio"; 42 - version = "2022.02.3+492"; 42 + version = "2022.07.1+554"; 43 43 RSTUDIO_VERSION_MAJOR = "2022"; 44 - RSTUDIO_VERSION_MINOR = "02"; 45 - RSTUDIO_VERSION_PATCH = "3"; 46 - RSTUDIO_VERSION_SUFFIX = "+492"; 44 + RSTUDIO_VERSION_MINOR = "07"; 45 + RSTUDIO_VERSION_PATCH = "1"; 46 + RSTUDIO_VERSION_SUFFIX = "+554"; 47 47 48 48 src = fetchFromGitHub { 49 49 owner = "rstudio"; 50 50 repo = "rstudio"; 51 51 rev = "v${version}"; 52 - sha256 = "1pgbk5rpy47h9ihdrplbfhfc49hrc6242j9099bclq7rqif049wi"; 52 + sha256 = "0rmdqxizxqg2vgr3lv066cjmlpjrxjlgi0m97wbh6iyhkfm2rrj1"; 53 53 }; 54 54 55 55 mathJaxSrc = fetchurl { ··· 129 129 ./use-system-node.patch 130 130 ./fix-resources-path.patch 131 131 ./pandoc-nix-path.patch 132 + ./remove-quarto-from-generator.patch 133 + ./do-not-install-pandoc.patch 132 134 ]; 133 135 134 136 postPatch = '' ··· 196 198 done 197 199 198 200 rm -r $out/lib/rstudio/{INSTALL,COPYING,NOTICE,README.md,SOURCE,VERSION} 199 - rm -r $out/lib/rstudio/bin/{pandoc/pandoc,pandoc} 200 201 ''; 201 202 202 203 meta = with lib; {
+13
pkgs/applications/editors/rstudio/do-not-install-pandoc.patch
··· 1 + --- a/src/cpp/session/CMakeLists.txt 2 + +++ b/src/cpp/session/CMakeLists.txt 3 + @@ -60,8 +60,7 @@ 4 + 5 + # validate our dependencies exist 6 + foreach(VAR RSTUDIO_DEPENDENCIES_DICTIONARIES_DIR 7 + - RSTUDIO_DEPENDENCIES_MATHJAX_DIR 8 + - RSTUDIO_DEPENDENCIES_PANDOC_DIR) 9 + + RSTUDIO_DEPENDENCIES_MATHJAX_DIR) 10 + 11 + # validate existence 12 + if(NOT EXISTS "${${VAR}}") 13 +
+32
pkgs/applications/editors/rstudio/remove-quarto-from-generator.patch
··· 1 + --- a/src/cpp/session/CMakeLists.txt 2 + +++ b/src/cpp/session/CMakeLists.txt 3 + @@ -43,12 +43,6 @@ 4 + set(RSTUDIO_DEPENDENCIES_MATHJAX_DIR "${RSTUDIO_DEPENDENCIES_DIR}/mathjax-27") 5 + endif() 6 + 7 + - if(EXISTS "${RSTUDIO_TOOLS_ROOT}/quarto") 8 + - set(RSTUDIO_DEPENDENCIES_QUARTO_DIR "${RSTUDIO_TOOLS_ROOT}/quarto") 9 + - else() 10 + - set(RSTUDIO_DEPENDENCIES_QUARTO_DIR "${RSTUDIO_DEPENDENCIES_DIR}/quarto") 11 + - endif() 12 + - 13 + endif() 14 + 15 + 16 + @@ -67,14 +61,7 @@ 17 + # validate our dependencies exist 18 + foreach(VAR RSTUDIO_DEPENDENCIES_DICTIONARIES_DIR 19 + RSTUDIO_DEPENDENCIES_MATHJAX_DIR 20 + - RSTUDIO_DEPENDENCIES_PANDOC_DIR 21 + - RSTUDIO_DEPENDENCIES_QUARTO_DIR) 22 + - 23 + - 24 + - # skip quarto if not enabled 25 + - if("${VAR}" STREQUAL "RSTUDIO_DEPENDENCIES_QUARTO_DIR" AND NOT QUARTO_ENABLED) 26 + - continue() 27 + - endif() 28 + + RSTUDIO_DEPENDENCIES_PANDOC_DIR) 29 + 30 + # validate existence 31 + if(NOT EXISTS "${${VAR}}") 32 +
+7 -6
pkgs/applications/editors/rstudio/use-system-node.patch
··· 1 1 --- a/src/gwt/build.xml 2 2 +++ b/src/gwt/build.xml 3 - @@ -84,23 +84,7 @@ 3 + @@ -83,24 +83,7 @@ 4 + <echo>Concatenated acesupport files to 'acesupport.js'</echo> 4 5 </target> 5 - 6 - <!-- panmirror typescript library --> 6 + 7 + - <!-- panmirror typescript library --> 7 8 - <!-- ensure version matches RSTUDIO_NODE_VERSION --> 8 - - <property name="node.version" value="14.17.5"/> 9 + - <property name="node.version" value="16.14.0"/> 9 10 - <property name="node.dir" value="../../dependencies/common/node/${node.version}"/> 10 11 - <condition property="node.bin" value="../../../${node.dir}/bin/node"> 11 12 - <not> ··· 21 22 - property="node.bin" 22 23 - value="/opt/rstudio-tools/dependencies/common/node/${node.version}/bin/node" 23 24 - file="/opt/rstudio-tools/dependencies/common/node/${node.version}/bin/node"/> 24 - + <property name="node.bin" value="@node@/bin/node"/> 25 - 25 + + <property name="node.bin" value="@node@/bin/node"/> 26 + 26 27 <property name="panmirror.dir" value="./panmirror/src/editor"/> 27 28 <property name="panmirror.build.dir" value="./www/js/panmirror"/> 28 29