Skip to content

slapos
slapos
Commit a113f183 authored by Jérome Perrin's avatar Jérome Perrin
Browse files
Options

Theia 1.35.0 

See merge request !1365
parents bdb7777b 9eb3117b
Pipeline #26933 failed with stage
    Hide whitespace changes
    Inline Side-by-side
    Showing with 796 additions and 876 deletions
    component/git/buildout.cfg
    View file @ a113f183
    ...@@ -18,8 +18,8 @@ parts = ...@@ -18,8 +18,8 @@ parts =
    [git] [git]
    recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
    shared = true shared = true
    url = https://mirrors.edge.kernel.org/pub/software/scm/git/git-2.39.1.tar.xz url = https://mirrors.edge.kernel.org/pub/software/scm/git/git-2.39.2.tar.xz
    md5sum = 74b450a513504fd7b3f5016f80de5e54 md5sum = 32d34dc65ae0955cc68c7152b5ca8b13
    configure-options = configure-options =
    --with-curl=${curl:location} --with-curl=${curl:location}
    --with-openssl=${openssl:location} --with-openssl=${openssl:location}
    ......
    component/nodejs/buildout.cfg
    View file @ a113f183
    ...@@ -12,22 +12,31 @@ extends = ...@@ -12,22 +12,31 @@ extends =
    parts = parts =
    nodejs nodejs
    #[nodejs] [nodejs]
    #<= nodejs-X.Y.Z <= nodejs-16.19.0
    # nodejs 16 needs gcc > 8.3 # nodejs 16 needs gcc > 8.3
    [gcc] [gcc]
    min_version = 8.3 min_version = 8.3
    [nodejs-16.13.2] [nodejs-16.19.0]
    <= nodejs-base <= nodejs-base
    openssl_location = ${openssl:location} openssl_location = ${openssl:location}
    version = v16.13.2 version = v16.19.0
    md5sum = ae3a05fc273536f83c685a7425a7882d md5sum = e72b698681aff62bf17146ad70dc9425
    patches = patches =
    https://raw.githubusercontent.com/nxhack/openwrt-node-packages/9e3ab4cc9fd5f19c25ccd6f19be5a9b47e2c6933/node/patches/v16.x/010-execvp-arg-list-too-long.patch#17bb14ea3a1b5b4832e3680e4edfeded https://raw.githubusercontent.com/nxhack/openwrt-node-packages/9e3ab4cc9fd5f19c25ccd6f19be5a9b47e2c6933/node/patches/v16.x/010-execvp-arg-list-too-long.patch#17bb14ea3a1b5b4832e3680e4edfeded
    patch-options = -p1 patch-options = -p1
    PATH = ${pkgconfig:location}/bin:${python3:location}/bin:${patch:location}/bin/:%(PATH)s PATH = ${pkgconfig:location}/bin:${python3:location}/bin:${patch:location}/bin/:%(PATH)s
    post-install =
    # configure header tarball for node-gyp
    # https://stackoverflow.com/a/64052237
    @@LOCATION@@/bin/node @@LOCATION@@/bin/npm config set --global tarball ${nodejs-headers-base-16.19.0:target}
    [nodejs-headers-base-16.19.0]
    <= nodejs-headers-base
    version = v16.19.0
    md5sum = e7bfbf135ae54d1dcca63bf17be84818
    [nodejs-14.16.0] [nodejs-14.16.0]
    <= nodejs-base <= nodejs-base
    ...@@ -81,3 +90,10 @@ environment = ...@@ -81,3 +90,10 @@ environment =
    CPPFLAGS=-I${zlib:location}/include CPPFLAGS=-I${zlib:location}/include
    LDFLAGS=-Wl,-rpath=${:openssl_location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib LDFLAGS=-Wl,-rpath=${:openssl_location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
    LD_LIBRARY_PATH=${:openssl_location}/lib LD_LIBRARY_PATH=${:openssl_location}/lib
    [nodejs-headers-base]
    recipe = slapos.recipe.build:download
    shared = true
    version =
    md5sum =
    url = https://nodejs.org/download/release/${:version}/node-${:version}-headers.tar.gz
    component/theia/buildout.cfg
    View file @ a113f183
    ...@@ -148,7 +148,7 @@ content = ...@@ -148,7 +148,7 @@ content =
    "editor.tabSize": 2, "editor.tabSize": 2,
    "plantuml.server": "https://plantuml.host.vifib.net/svg/", "plantuml.server": "https://plantuml.host.vifib.net/svg/",
    "plantuml.render": "PlantUMLServer", "plantuml.render": "PlantUMLServer",
    "python.pythonPath": "${python:executable}", "python.defaultInterpreterPath": "${python:executable}",
    "gitlens.remotes": [{ "domain": "lab.nexedi.com", "type": "GitLab" }] "gitlens.remotes": [{ "domain": "lab.nexedi.com", "type": "GitLab" }]
    }, },
    "warnOnPotentiallyInsecureHostPattern": false "warnOnPotentiallyInsecureHostPattern": false
    ......
    component/theia/buildout.hash.cfg
    View file @ a113f183
    ...@@ -19,8 +19,8 @@ md5sum = 6343592161a349bb40e0de16ce67aa51 ...@@ -19,8 +19,8 @@ md5sum = 6343592161a349bb40e0de16ce67aa51
    [yarn.lock] [yarn.lock]
    _update_hash_filename_ = yarn.lock _update_hash_filename_ = yarn.lock
    md5sum = c28b0fa56592066e7031de696a5d02b3 md5sum = 6435aaf48cbbfe7911505c2c45cc53ea
    [ms-python-disable-jedi-buildout.patch] [ms-python-disable-jedi-buildout.patch]
    _update_hash_filename_ = ms-python-disable-jedi-buildout.patch _update_hash_filename_ = ms-python-disable-jedi-buildout.patch
    md5sum = 0ec840ffecceaf7e91a037d439962415 md5sum = 0b45bdaf2a353d4644c2292e07a3f2f8
    component/theia/download-plugins.cfg
    View file @ a113f183
    ...@@ -35,7 +35,7 @@ urls = vscode-bat https://open-vsx.org/api/vscode/bat/1.66.2/file/vscode.bat-1.6 ...@@ -35,7 +35,7 @@ urls = vscode-bat https://open-vsx.org/api/vscode/bat/1.66.2/file/vscode.bat-1.6
    vscode-lua https://open-vsx.org/api/vscode/lua/1.66.2/file/vscode.lua-1.66.2.vsix 9dc3f27215ec54eb5826be1028fb9dea vscode-lua https://open-vsx.org/api/vscode/lua/1.66.2/file/vscode.lua-1.66.2.vsix 9dc3f27215ec54eb5826be1028fb9dea
    vscode-make https://open-vsx.org/api/vscode/make/1.66.2/file/vscode.make-1.66.2.vsix 40e96e4b77a76d5a4d3bb3003213c984 vscode-make https://open-vsx.org/api/vscode/make/1.66.2/file/vscode.make-1.66.2.vsix 40e96e4b77a76d5a4d3bb3003213c984
    vscode-markdown https://open-vsx.org/api/vscode/markdown/1.66.2/file/vscode.markdown-1.66.2.vsix 1e5255ea17d052b923adb5c9c348daf6 vscode-markdown https://open-vsx.org/api/vscode/markdown/1.66.2/file/vscode.markdown-1.66.2.vsix 1e5255ea17d052b923adb5c9c348daf6
    vscode-markdown-language-features https://open-vsx.org/api/vscode/markdown-language-features/1.66.2/file/vscode.markdown-language-features-1.66.2.vsix 1eb8385b1bd0b7e4423550527cfc9521 vscode-markdown-language-features https://open-vsx.org/api/vscode/markdown-language-features/1.64.2/file/vscode.markdown-language-features-1.64.2.vsix 965b7d0fed9ae49df6dd0c923da7ad7e
    vscode-merge-conflict https://open-vsx.org/api/vscode/merge-conflict/1.66.2/file/vscode.merge-conflict-1.66.2.vsix e15004f78d0d543e99b229997c5b30c1 vscode-merge-conflict https://open-vsx.org/api/vscode/merge-conflict/1.66.2/file/vscode.merge-conflict-1.66.2.vsix e15004f78d0d543e99b229997c5b30c1
    vscode-npm https://open-vsx.org/api/vscode/npm/1.66.2/file/vscode.npm-1.66.2.vsix f0b5566477b44dfbbb6c51442c0156c3 vscode-npm https://open-vsx.org/api/vscode/npm/1.66.2/file/vscode.npm-1.66.2.vsix f0b5566477b44dfbbb6c51442c0156c3
    ms-vscode-node-debug https://open-vsx.org/api/ms-vscode/node-debug/1.45.0/file/ms-vscode.node-debug-1.45.0.vsix 676769e9901f5f51ed6a21d7c6a831fb ms-vscode-node-debug https://open-vsx.org/api/ms-vscode/node-debug/1.45.0/file/ms-vscode.node-debug-1.45.0.vsix 676769e9901f5f51ed6a21d7c6a831fb
    ...@@ -64,16 +64,16 @@ urls = vscode-bat https://open-vsx.org/api/vscode/bat/1.66.2/file/vscode.bat-1.6 ...@@ -64,16 +64,16 @@ urls = vscode-bat https://open-vsx.org/api/vscode/bat/1.66.2/file/vscode.bat-1.6
    vscode-theme-solarized-dark https://open-vsx.org/api/vscode/theme-solarized-dark/1.66.2/file/vscode.theme-solarized-dark-1.66.2.vsix 4d4d5b8a9dc298614c1e33aab061e58d vscode-theme-solarized-dark https://open-vsx.org/api/vscode/theme-solarized-dark/1.66.2/file/vscode.theme-solarized-dark-1.66.2.vsix 4d4d5b8a9dc298614c1e33aab061e58d
    vscode-theme-tomorrow-night-blue https://open-vsx.org/api/vscode/theme-tomorrow-night-blue/1.66.2/file/vscode.theme-tomorrow-night-blue-1.66.2.vsix 7177906c411b424e6fbfc56e529a2d76 vscode-theme-tomorrow-night-blue https://open-vsx.org/api/vscode/theme-tomorrow-night-blue/1.66.2/file/vscode.theme-tomorrow-night-blue-1.66.2.vsix 7177906c411b424e6fbfc56e529a2d76
    vscode-typescript https://open-vsx.org/api/vscode/typescript/1.66.2/file/vscode.typescript-1.66.2.vsix 3ab8adbc1d624020ec53ce8886b379e9 vscode-typescript https://open-vsx.org/api/vscode/typescript/1.66.2/file/vscode.typescript-1.66.2.vsix 3ab8adbc1d624020ec53ce8886b379e9
    vscode-typescript-language-features https://open-vsx.org/api/vscode/typescript-language-features/1.66.2/file/vscode.typescript-language-features-1.66.2.vsix 9bf14498209062cde3a642ce129ec6e0 vscode-typescript-language-features https://open-vsx.org/api/vscode/typescript-language-features/1.62.3/file/vscode.typescript-language-features-1.62.3.vsix de0fcfc97774ee2804c7952e1267d34a
    vscode-vb https://open-vsx.org/api/vscode/vb/1.66.2/file/vscode.vb-1.66.2.vsix 75c5d545ef4b16d13ccfcc7f458b2336 vscode-vb https://open-vsx.org/api/vscode/vb/1.66.2/file/vscode.vb-1.66.2.vsix 75c5d545ef4b16d13ccfcc7f458b2336
    vscode-vscode-theme-seti https://open-vsx.org/api/vscode/vscode-theme-seti/1.66.2/file/vscode.vscode-theme-seti-1.66.2.vsix 138ffbc1baad2a7e3211af579428ed4a vscode-vscode-theme-seti https://open-vsx.org/api/vscode/vscode-theme-seti/1.66.2/file/vscode.vscode-theme-seti-1.66.2.vsix 138ffbc1baad2a7e3211af579428ed4a
    vscode-xml https://open-vsx.org/api/vscode/xml/1.66.2/file/vscode.xml-1.66.2.vsix 0866e13f45a18ce2f932411600bf8529 vscode-xml https://open-vsx.org/api/vscode/xml/1.66.2/file/vscode.xml-1.66.2.vsix 0866e13f45a18ce2f932411600bf8529
    vscode-yaml https://open-vsx.org/api/vscode/yaml/1.66.2/file/vscode.yaml-1.66.2.vsix 2f9ab05c8f9bc676cecb59c26d8ff799 vscode-yaml https://open-vsx.org/api/vscode/yaml/1.66.2/file/vscode.yaml-1.66.2.vsix 2f9ab05c8f9bc676cecb59c26d8ff799
    EditorConfig-EditorConfig https://open-vsx.org/api/EditorConfig/EditorConfig/0.16.6/file/EditorConfig.EditorConfig-0.16.6.vsix e787245e6c68617178ae995ad97c3ccb EditorConfig-EditorConfig https://open-vsx.org/api/EditorConfig/EditorConfig/0.16.6/file/EditorConfig.EditorConfig-0.16.6.vsix e787245e6c68617178ae995ad97c3ccb
    dbaeumer-vscode-eslint https://open-vsx.org/api/dbaeumer/vscode-eslint/2.1.20/file/dbaeumer.vscode-eslint-2.1.20.vsix 1cb024ac02ebeb5ce6b0dfed6e51cdd2 dbaeumer-vscode-eslint https://open-vsx.org/api/dbaeumer/vscode-eslint/2.4.0/file/dbaeumer.vscode-eslint-2.4.0.vsix 35fa3a096ee97e327ff2fde4c2ea2309
    ms-vscode-references-view https://open-vsx.org/api/ms-vscode/references-view/0.0.89/file/ms-vscode.references-view-0.0.89.vsix 7ec05cb01a77ee7f6c5198a5225fa707 ms-vscode-references-view https://open-vsx.org/api/ms-vscode/references-view/0.0.89/file/ms-vscode.references-view-0.0.89.vsix 7ec05cb01a77ee7f6c5198a5225fa707
    ms-python-python https://open-vsx.org/api/ms-python/python/2020.10.332292344/file/ms-python.python-2020.10.332292344.vsix e5cb6d850db94278b9fda02e38851361 ms-python-python https://open-vsx.org/api/ms-python/python/2022.4.1/file/ms-python.python-2022.4.1.vsix 94ad676e762885fbd4e32d931aedd1de
    perrinjerome-vscode-zc-buildout https://open-vsx.org/api/perrinjerome/vscode-zc-buildout/0.9.0/file/perrinjerome.vscode-zc-buildout-0.9.0.vsix 82d96aab8f0960f956b93aca422a58ee perrinjerome-vscode-zc-buildout https://open-vsx.org/api/perrinjerome/vscode-zc-buildout/0.9.2/file/perrinjerome.vscode-zc-buildout-0.9.2.vsix 7782da250445b1b5781577aecf27c38c
    jebbs-plantuml https://open-vsx.org/api/jebbs/plantuml/2.14.0/file/jebbs.plantuml-2.14.0.vsix 13fa7cbd14a30ecca166c41a307c7a73 jebbs-plantuml https://open-vsx.org/api/jebbs/plantuml/2.14.0/file/jebbs.plantuml-2.14.0.vsix 13fa7cbd14a30ecca166c41a307c7a73
    rafaelmaiolla-diff https://open-vsx.org/api/rafaelmaiolla/diff/0.0.1/file/rafaelmaiolla.diff-0.0.1.vsix 1d8f868bc19b7d703c1be2bf99c4c7f9 rafaelmaiolla-diff https://open-vsx.org/api/rafaelmaiolla/diff/0.0.1/file/rafaelmaiolla.diff-0.0.1.vsix 1d8f868bc19b7d703c1be2bf99c4c7f9
    perrinjerome-git-commit-syntax https://open-vsx.org/api/perrinjerome/git-commit-syntax/0.0.1/file/perrinjerome.git-commit-syntax-0.0.1.vsix 46625f2f05e244911c2cb9cc5032c0ef perrinjerome-git-commit-syntax https://open-vsx.org/api/perrinjerome/git-commit-syntax/0.0.1/file/perrinjerome.git-commit-syntax-0.0.1.vsix 46625f2f05e244911c2cb9cc5032c0ef
    ......
    component/theia/generate_download_plugins_cfg.py
    View file @ a113f183
    import configparser import configparser
    import hashlib
    import logging import logging
    import os
    import requests import requests
    import hashlib
    urls = [] urls = []
    session = requests.Session() session = requests.Session()
    ...@@ -47,7 +49,9 @@ for plugin_and_version in '''\ ...@@ -47,7 +49,9 @@ for plugin_and_version in '''\
    vscode/lua/latest vscode/lua/latest
    vscode/make/latest vscode/make/latest
    vscode/markdown/latest vscode/markdown/latest
    vscode/markdown-language-features/latest # Activating extension 'Markdown Language Features (built-in)' failed:
    # i.workspace.onWillDropOnTextEditor is not a function
    vscode/markdown-language-features/1.64.2
    vscode/merge-conflict/latest vscode/merge-conflict/latest
    vscode/npm/latest vscode/npm/latest
    ms-vscode/node-debug/latest ms-vscode/node-debug/latest
    ...@@ -76,19 +80,15 @@ for plugin_and_version in '''\ ...@@ -76,19 +80,15 @@ for plugin_and_version in '''\
    vscode/theme-solarized-dark/latest vscode/theme-solarized-dark/latest
    vscode/theme-tomorrow-night-blue/latest vscode/theme-tomorrow-night-blue/latest
    vscode/typescript/latest vscode/typescript/latest
    vscode/typescript-language-features/latest vscode/typescript-language-features/1.62.3
    vscode/vb/latest vscode/vb/latest
    vscode/vscode-theme-seti/latest vscode/vscode-theme-seti/latest
    vscode/xml/latest vscode/xml/latest
    vscode/yaml/latest vscode/yaml/latest
    EditorConfig/EditorConfig/latest EditorConfig/EditorConfig/latest
    # latest (2.2.2) does not activate: dbaeumer/vscode-eslint/latest
    # Activating extension 'ESLint' failed: Class extends value undefined is not a constructor or null
    dbaeumer/vscode-eslint/2.1.20
    ms-vscode/references-view/latest ms-vscode/references-view/latest
    # golang.Go removed because it overwrites the PATH in theia shell ms-python/python/2022.4.1
    # golang/Go/0.16.2
    ms-python/python/2020.10.332292344
    perrinjerome/vscode-zc-buildout/latest perrinjerome/vscode-zc-buildout/latest
    jebbs/plantuml/2.14.0 jebbs/plantuml/2.14.0
    rafaelmaiolla/diff/latest rafaelmaiolla/diff/latest
    ...@@ -112,7 +112,7 @@ cfg.set('theia-download-plugins', 'urls', '\n'.join(urls)) ...@@ -112,7 +112,7 @@ cfg.set('theia-download-plugins', 'urls', '\n'.join(urls))
    with open('download-plugins.cfg', 'w') as f: with open('download-plugins.cfg', 'w') as f:
    f.write(f"""\ f.write(f"""\
    # This file is automatically generated from {__file__} # This file is automatically generated from {os.path.basename(__file__)}
    # Do not edit directly. # Do not edit directly.
    """) """)
    cfg.write(f) cfg.write(f)
    component/theia/ms-python-disable-jedi-buildout.patch
    View file @ a113f183
    ...@@ -5,13 +5,13 @@ This slows down jedi a lot and can make it crash on some scripts. ...@@ -5,13 +5,13 @@ This slows down jedi a lot and can make it crash on some scripts.
    See also https://github.com/davidhalter/jedi/issues/1325 See also https://github.com/davidhalter/jedi/issues/1325
    --- ---
    extension/pythonFiles/lib/python/jedi/inference/sys_path.py | 1 + extension/pythonFiles/lib/jedilsp/jedi/inference/sys_path.py | 1 +
    1 file changed, 1 insertion(+) 1 file changed, 1 insertion(+)
    diff --git a/extension/pythonFiles/lib/python/jedi/inference/sys_path.py b/extension/pythonFiles/lib/python/jedi/inference/sys_path.py diff --git a/extension/pythonFiles/lib/jedilsp/jedi/inference/sys_path.py b/extension/pythonFiles/lib/jedilsp/jedi/inference/sys_path.py
    index 5b82ec1..256b19c 100644 index 062a0aa..7b5fd42 100644
    --- a/extension/pythonFiles/lib/python/jedi/inference/sys_path.py --- a/extension/pythonFiles/lib/jedilsp/jedi/inference/sys_path.py
    +++ b/extension/pythonFiles/lib/python/jedi/inference/sys_path.py +++ b/extension/pythonFiles/lib/jedilsp/jedi/inference/sys_path.py
    @@ -137,6 +137,7 @@ def check_sys_path_modifications(module_context): @@ -137,6 +137,7 @@ def check_sys_path_modifications(module_context):
    def discover_buildout_paths(inference_state, script_path): def discover_buildout_paths(inference_state, script_path):
    ......
    component/theia/yarn.lock
    View file @ a113f183
    This source diff could not be displayed because it is too large. You can view the blob instead.
    software/peertube/software.cfg
    View file @ a113f183
    ...@@ -57,8 +57,6 @@ parts = ...@@ -57,8 +57,6 @@ parts =
    peertube-build peertube-build
    instance-profile instance-profile
    [nodejs]
    <= nodejs-16.13.2
    [peertube] [peertube]
    recipe = slapos.recipe.build:download-unpacked recipe = slapos.recipe.build:download-unpacked
    ......
    software/theia/software.cfg
    View file @ a113f183
    ...@@ -35,8 +35,6 @@ shared-part-list = ...@@ -35,8 +35,6 @@ shared-part-list =
    # erp5 inside theia's slapos parts can be shared. # erp5 inside theia's slapos parts can be shared.
    max_version = 0 max_version = 0
    [nodejs]
    <= nodejs-16.13.2
    [gowork] [gowork]
    install += install +=
    ......
    Markdown is supported
    0% or
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment
    GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7