public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vscode-extensions.ms-python.python: 2020.2.64397 -> 2020.3.69010

Browse Source
This commit is contained in:
Edmund Wu 2020-03-22 21:53:39 -04:00 committed by Jon
parent 2a5a719930
commit 3c4c703368
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
pkgs/misc/vscode-extensions/python/default.nix
View File

@ -1,18 +1,18 @@
{ lib, stdenv, fetchurl, vscode-utils, extractNuGet { lib, stdenv, fetchurl, vscode-utils, extractNuGet
, icu, curl, openssl, lttng-ust, autoPatchelfHook , icu, curl, openssl, lttng-ust, autoPatchelfHook
, pythonUseFixed ? false, python # When `true`, the python default setting will be fixed to specified. , python3
# Use version from `PATH` for default setting otherwise. , pythonUseFixed ? false # When `true`, the python default setting will be fixed to specified.
# Defaults to `false` as we expect it to be project specific most of the time. # Use version from `PATH` for default setting otherwise.
, ctagsUseFixed ? true, ctags # When `true`, the ctags default setting will be fixed to specified. # Defaults to `false` as we expect it to be project specific most of the time.
# Use version from `PATH` for default setting otherwise. , ctagsUseFixed ? true, ctags # When `true`, the ctags default setting will be fixed to specified.
# Defaults to `true` as usually not defined on a per projet basis. # Use version from `PATH` for default setting otherwise.
# Defaults to `true` as usually not defined on a per projet basis.
}: }:
assert pythonUseFixed -> null != python;
assert ctagsUseFixed -> null != ctags; assert ctagsUseFixed -> null != ctags;
let let
pythonDefaultsTo = if pythonUseFixed then "${python}/bin/python" else "python"; pythonDefaultsTo = if pythonUseFixed then "${python3}/bin/python" else "python";
ctagsDefaultsTo = if ctagsUseFixed then "${ctags}/bin/ctags" else "ctags"; ctagsDefaultsTo = if ctagsUseFixed then "${ctags}/bin/ctags" else "ctags";
# The arch tag comes from 'PlatformName' defined here: # The arch tag comes from 'PlatformName' defined here:
@ -23,14 +23,14 @@ let
else throw "Only x86_64 Linux and Darwin are supported."; else throw "Only x86_64 Linux and Darwin are supported.";
languageServerSha256 = { languageServerSha256 = {
linux-x64 = "10qwi8lih5i6216d1vqsmviab73ha0d3zdvircrgrydkf0d4ancd"; linux-x64 = "1pmj5pb4xylx4gdx4zgmisn0si59qx51n2m1bh7clv29q6biw05n";
osx-x64 = "08gjxs0bjhz5a9l35vvgwnvzshsyyqiqvb5hxv6w0k2ajgv5z7av"; osx-x64 = "0ishiy1z9dghj4ryh95vy8rw0v7q4birdga2zdb4a8am31wmp94b";
}.${arch}; }.${arch};
# version is languageServerVersion in the package.json # version is languageServerVersion in the package.json
languageServer = extractNuGet rec { languageServer = extractNuGet rec {
name = "Python-Language-Server"; name = "Python-Language-Server";
version = "0.4.127"; version = "0.5.30";
src = fetchurl { src = fetchurl {
url = "https://pvsc.azureedge.net/python-language-server-stable/${name}-${arch}.${version}.nupkg"; url = "https://pvsc.azureedge.net/python-language-server-stable/${name}-${arch}.${version}.nupkg";
@ -41,8 +41,8 @@ in vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = { mktplcRef = {
name = "python"; name = "python";
publisher = "ms-python"; publisher = "ms-python";
version = "2020.2.64397"; version = "2020.3.69010";
sha256 = "1kwyc5ycz1276i2zbw93mpq59y2py6kj71gvhzya8xvm184jk07a"; sha256 = "1dg8wfc3yl0msg6c9ccbvwc78f559109slsagi0lgnbc40v6v24b";
}; };
buildInputs = [ buildInputs = [
@ -54,6 +54,11 @@ in vscode-utils.buildVscodeMarketplaceExtension {
nativeBuildInputs = [ nativeBuildInputs = [
autoPatchelfHook autoPatchelfHook
python3.pkgs.wrapPython
];
pythonPath = with python3.pkgs; [
setuptools
]; ];
postPatch = '' postPatch = ''
@ -70,6 +75,8 @@ in vscode-utils.buildVscodeMarketplaceExtension {
mkdir -p "$out/$installPrefix/languageServer.${languageServer.version}" mkdir -p "$out/$installPrefix/languageServer.${languageServer.version}"
cp -R --no-preserve=ownership ${languageServer}/* "$out/$installPrefix/languageServer.${languageServer.version}" cp -R --no-preserve=ownership ${languageServer}/* "$out/$installPrefix/languageServer.${languageServer.version}"
chmod -R +wx "$out/$installPrefix/languageServer.${languageServer.version}" chmod -R +wx "$out/$installPrefix/languageServer.${languageServer.version}"
patchPythonScript "$out/$installPrefix/pythonFiles/lib/python/isort/main.py"
''; '';
meta = with lib; { meta = with lib; {