diff --git a/srcpkgs/vscode/patches/remove_git_command.patch b/srcpkgs/vscode/patches/remove_git_command.patch new file mode 100644 index 0000000000..a99643c055 --- /dev/null +++ b/srcpkgs/vscode/patches/remove_git_command.patch @@ -0,0 +1,10 @@ +diff --git a/build/npm/postinstall.js b/build/npm/postinstall.js +index ef8fa4a47f66..7b8b710636a7 100644 +--- a/build/npm/postinstall.js ++++ b/build/npm/postinstall.js +@@ -73,5 +73,3 @@ yarnInstall('test/automation'); // node modules required for smoketest + yarnInstall('test/smoke'); // node modules required for smoketest + yarnInstall('test/integration/browser'); // node modules required for integration + yarnInstallBuildDependencies(); // node modules for watching, specific to host node version, not electron +- +-cp.execSync('git config pull.rebase true'); diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template index d870454e6f..9624022dcd 100644 --- a/srcpkgs/vscode/template +++ b/srcpkgs/vscode/template @@ -1,6 +1,6 @@ # Template file for 'vscode' pkgname=vscode -version=1.46.0 +version=1.47.3 revision=1 hostmakedepends="pkg-config python nodejs-lts-10 yarn tar" makedepends="libxkbfile-devel libsecret-devel" @@ -10,7 +10,7 @@ maintainer="shizonic " license="MIT" homepage="https://code.visualstudio.com/" distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz" -checksum=5bf4d51773bb26a484e0063b668cba38b5f7451cb77be230fbf64fa44d498ad8 +checksum=463c8d5c3e02035ada5c0b9dcbb8718841fa27f6258838bfa4bab3a916ca16f3 patch_args="-Np1" # Due to electron