github-actions[bot]
2 years ago
committed by
GitHub
commit
f40a25207d
@ -0,0 +1,19 @@ |
||||
--- a/src/cpp/desktop/DesktopOptions.cpp
|
||||
+++ b/src/cpp/desktop/DesktopOptions.cpp
|
||||
@@ -499,15 +499,9 @@
|
||||
{
|
||||
if (resourcesPath_.isEmpty())
|
||||
{
|
||||
-#ifdef RSTUDIO_PACKAGE_BUILD
|
||||
// release configuration: the 'resources' folder is
|
||||
// part of the supporting files folder
|
||||
- resourcesPath_ = supportingFilePath().completePath("resources");
|
||||
-#else
|
||||
- // developer configuration: the 'resources' folder is
|
||||
- // a sibling of the RStudio executable
|
||||
- resourcesPath_ = scriptsPath().completePath("resources");
|
||||
-#endif
|
||||
+ resourcesPath_ = supportingFilePath().completePath("resources");
|
||||
}
|
||||
|
||||
return resourcesPath_;
|
||||
@ -0,0 +1,11 @@ |
||||
--- a/src/cpp/session/include/session/SessionConstants.hpp
|
||||
+++ b/src/cpp/session/include/session/SessionConstants.hpp
|
||||
@@ -140,7 +140,7 @@
|
||||
#ifdef QUARTO_ENABLED
|
||||
# define kDefaultPandocPath "bin/quarto/bin"
|
||||
#else
|
||||
-# define kDefaultPandocPath "bin/pandoc"
|
||||
+# define kDefaultPandocPath "@pandoc@"
|
||||
#endif
|
||||
|
||||
#define kDefaultQuartoPath "bin/quarto"
|
||||
@ -0,0 +1,28 @@ |
||||
--- a/src/gwt/build.xml
|
||||
+++ b/src/gwt/build.xml
|
||||
@@ -84,23 +84,7 @@
|
||||
</target>
|
||||
|
||||
<!-- panmirror typescript library -->
|
||||
- <!-- ensure version matches RSTUDIO_NODE_VERSION -->
|
||||
- <property name="node.version" value="14.17.5"/>
|
||||
- <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"/>
|
||||
+ <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"/>
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,22 @@ |
||||
{ lib, mkFranzDerivation, fetchurl, xorg }: |
||||
|
||||
mkFranzDerivation rec { |
||||
pname = "ferdium"; |
||||
name = "Ferdium"; |
||||
version = "6.0.0-nightly.65"; |
||||
src = fetchurl { |
||||
url = "https://github.com/ferdium/ferdium-app/releases/download/v${version}/ferdium_${version}_amd64.deb"; |
||||
sha256 = "sha256-vmu74aLAKGbmRf9hkMUL5VOfi/Cbvdix9MzsZK1qW80="; |
||||
}; |
||||
|
||||
extraBuildInputs = [ xorg.libxshmfence ]; |
||||
|
||||
meta = with lib; { |
||||
description = "All your services in one place built by the community"; |
||||
homepage = "https://ferdium.org/"; |
||||
license = licenses.asl20; |
||||
maintainers = with maintainers; [ magnouvean ]; |
||||
platforms = [ "x86_64-linux" ]; |
||||
hydraPlatforms = [ ]; |
||||
}; |
||||
} |
||||
@ -1,6 +1,6 @@ |
||||
{ |
||||
"commit": "a4be9679c308459b390768e6195f3f08ae5366db", |
||||
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/a4be9679c308459b390768e6195f3f08ae5366db.tar.gz", |
||||
"sha256": "09pr3ag0k1wjiih36p902gcpygxg8f7wqpr5g8j7ka851g0gckqa", |
||||
"msg": "Update from Hackage at 2022-06-04T09:01:11Z" |
||||
"commit": "e55c7aa130b33bcfe416a246d9e8a108c63022f9", |
||||
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/e55c7aa130b33bcfe416a246d9e8a108c63022f9.tar.gz", |
||||
"sha256": "1nmqxlj9c76xpyz1js47bk7m05mr229c8y5k7gnnjwh4gspr0p0r", |
||||
"msg": "Update from Hackage at 2022-06-07T15:13:17Z" |
||||
} |
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,35 @@ |
||||
{ lib, stdenv, fetchFromGitHub }: |
||||
|
||||
stdenv.mkDerivation { |
||||
pname = "sokol"; |
||||
version = "unstable-2022-06-13"; |
||||
|
||||
src = fetchFromGitHub { |
||||
owner = "floooh"; |
||||
repo = "sokol"; |
||||
rev = "3c7016105f3b7463f0cfc74df8a55642e5448c11"; |
||||
sha256 = "sha256-dKHb6GTp5aJPuWWXI4ZYnhgdXs23gGWyPymGPGwxcLY="; |
||||
}; |
||||
|
||||
dontBuild = true; |
||||
dontConfigure = true; |
||||
|
||||
installPhase = '' |
||||
runHook preInstall |
||||
|
||||
mkdir -p $out/include/sokol |
||||
cp *.h $out/include/sokol/ |
||||
cp -R util $out/include/sokol/util |
||||
|
||||
runHook postInstall |
||||
''; |
||||
|
||||
meta = with lib; { |
||||
description = "Minimal cross-platform standalone C headers"; |
||||
homepage = "https://github.com/floooh/sokol"; |
||||
license = licenses.zlib; |
||||
platforms = platforms.all; |
||||
maintainers = with maintainers; [ jonnybolton ]; |
||||
}; |
||||
} |
||||
|
||||
@ -0,0 +1,37 @@ |
||||
{ buildPythonPackage |
||||
, fetchzip |
||||
, isPy3k |
||||
, lib |
||||
, mkdocs |
||||
}: |
||||
|
||||
buildPythonPackage rec { |
||||
pname = "mkdocs-gitlab-plugin"; |
||||
version = "0.1.4"; |
||||
|
||||
disabled = !isPy3k; |
||||
|
||||
src = fetchzip { |
||||
url = "https://gitlab.inria.fr/vidjil/mkdocs-gitlab-plugin/-/archive/fb87fbfd404839e661a799c540664b1103096a5f/mkdocs-gitlab-plugin-fb87fbfd404839e661a799c540664b1103096a5f.tar.gz"; |
||||
sha256 = "sha256-z+U0PRwymDDXVNM7a2Yl4pNNVBxpx/BhJnlx6kgyvww="; |
||||
}; |
||||
|
||||
patches = [ ./mkdocs-gitlab-plugin.diff ]; |
||||
|
||||
propagatedBuildInputs = [ mkdocs ]; |
||||
|
||||
pythonImportsCheck = [ "mkdocs_gitlab_plugin" ]; |
||||
|
||||
meta = with lib; { |
||||
description = "MkDocs plugin to transform strings such as #1234, %56, or !789 into links to a Gitlab repository."; |
||||
homepage = "https://gitlab.inria.fr/vidjil/mkdocs-gitlab-plugin"; |
||||
license = licenses.mit; |
||||
maintainers = with maintainers; [ snpschaaf ]; |
||||
longDescription = '' |
||||
Plugin for MkDocs. |
||||
Transform handles such as #1234, %56, !789, &12 or $34 into links to a gitlab repository, |
||||
given by the gitlab_url configuration option. |
||||
Before the #/%/!/&/$ is needed either a space, a '(', or a '['. |
||||
''; |
||||
}; |
||||
} |
||||
@ -0,0 +1,37 @@ |
||||
diff --git a/mkdocs_gitlab_plugin/plugin.py b/mkdocs_gitlab_plugin/plugin.py
|
||||
index e8d7ab7..8b883f5 100644
|
||||
--- a/mkdocs_gitlab_plugin/plugin.py
|
||||
+++ b/mkdocs_gitlab_plugin/plugin.py
|
||||
@@ -3,7 +3,7 @@
|
||||
import re
|
||||
import mkdocs
|
||||
|
||||
-from mkdocs.config import Config
|
||||
+from mkdocs.config.config_options import Type
|
||||
from mkdocs.plugins import BasePlugin
|
||||
|
||||
class GitlabLinksPlugin(BasePlugin):
|
||||
@@ -13,8 +13,8 @@ class GitlabLinksPlugin(BasePlugin):
|
||||
'''
|
||||
|
||||
config_scheme = (
|
||||
- ('gitlab_url', mkdocs.config.config_options.Type(str, default='http://gitlab.com/XXX')),
|
||||
- ('verbose', mkdocs.config.config_options.Type(bool, default=False))
|
||||
+ ('gitlab_url', Type(str, default='http://gitlab.com/XXX')),
|
||||
+ ('verbose', Type(bool, default=False))
|
||||
)
|
||||
|
||||
TOKEN_PATHS = {
|
||||
diff --git a/mkdocs_gitlab_plugin/test.py b/mkdocs_gitlab_plugin/test.py
|
||||
index 4a5c35f..d5a19c6 100644
|
||||
--- a/mkdocs_gitlab_plugin/test.py
|
||||
+++ b/mkdocs_gitlab_plugin/test.py
|
||||
@@ -1,7 +1,7 @@
|
||||
|
||||
import sys
|
||||
|
||||
-from plugin import GitlabLinksPlugin
|
||||
+from .plugin import GitlabLinksPlugin
|
||||
|
||||
if __name__ == '__main__':
|
||||
plugin = GitlabLinksPlugin()
|
||||
@ -0,0 +1,37 @@ |
||||
nvidia_x11: hash: |
||||
{ stdenv |
||||
, lib |
||||
, fetchFromGitHub |
||||
, kernel |
||||
}: |
||||
|
||||
stdenv.mkDerivation { |
||||
pname = "nvidia-open"; |
||||
version = "${kernel.version}-${nvidia_x11.version}"; |
||||
|
||||
src = fetchFromGitHub { |
||||
owner = "NVIDIA"; |
||||
repo = "open-gpu-kernel-modules"; |
||||
rev = nvidia_x11.version; |
||||
inherit hash; |
||||
}; |
||||
|
||||
nativeBuildInputs = kernel.moduleBuildDependencies; |
||||
|
||||
makeFlags = kernel.makeFlags ++ [ |
||||
"SYSSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source" |
||||
"SYSOUT=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" |
||||
"MODLIB=$(out)/lib/modules/${kernel.modDirVersion}" |
||||
]; |
||||
|
||||
installTargets = [ "modules_install" ]; |
||||
enableParallelBuilding = true; |
||||
|
||||
meta = with lib; { |
||||
description = "NVIDIA Linux Open GPU Kernel Module"; |
||||
homepage = "https://github.com/NVIDIA/open-gpu-kernel-modules"; |
||||
license = with licenses; [ gpl2Plus mit ]; |
||||
platforms = platforms.linux; |
||||
maintainers = with maintainers; [ nickcao ]; |
||||
}; |
||||
} |
||||
@ -0,0 +1,23 @@ |
||||
{ lib, buildGoModule, fetchFromGitHub }: |
||||
|
||||
buildGoModule rec { |
||||
pname = "iam-policy-json-to-terraform"; |
||||
version = "1.8.0"; |
||||
|
||||
src = fetchFromGitHub { |
||||
owner = "flosell"; |
||||
repo = pname; |
||||
rev = "${version}"; |
||||
sha256 = "sha256-1OQvm3M/n/8F3QHNfPlq9YQVyV97NlHX3dXWA/VXEZU="; |
||||
}; |
||||
|
||||
vendorSha256 = "sha256-Fn5GgGW9QhnQOKV34Kzl1Yctv3XLQ51lCuuGx5kvlIA="; |
||||
|
||||
meta = with lib; { |
||||
description = "Small tool to convert an IAM Policy in JSON format into a Terraform aws_iam_policy_document "; |
||||
homepage = "https://github.com/flosell/iam-policy-json-to-terraform"; |
||||
changelog = "https://github.com/flosell/iam-policy-json-to-terraform/releases/tag/${version}"; |
||||
license = licenses.asl20; |
||||
maintainers = [ maintainers.ivankovnatsky ]; |
||||
}; |
||||
} |
||||
Loading…
Reference in new issue