vscode-extensions.ms-python.python: refactor

In order for the ms-python.python extension to work these days,
we also need the ms-toolsai.jupyter extension.  To permit easy
upgrades and to honour the principle of least surprise, we
wrapper the Python extension to include the Jupyter one.  The
reverse is not true, you *can* have the Jupyter extension without
the Python one, so the reverse is not also done.

Signed-off-by: Daniel Silverstone <dsilvers@digital-scurf.org>
This commit is contained in:
Daniel Silverstone 2021-04-28 20:53:53 +01:00
parent 5903b963f4
commit b71773ee07
No known key found for this signature in database
GPG Key ID: C30DF439F2987D74

View File

@ -1,4 +1,4 @@
{ config, lib, callPackage, vscode-utils, nodePackages, jdk, llvmPackages_8 }:
{ config, lib, buildEnv, callPackage, vscode-utils, nodePackages, jdk, llvmPackages_8 }:
let
inherit (vscode-utils) buildVscodeMarketplaceExtension;
@ -702,9 +702,15 @@ let
ms-vscode-remote.remote-ssh = callPackage ./remote-ssh {};
ms-python.python = callPackage ./python {
extractNuGet = callPackage ./python/extract-nuget.nix { };
};
ms-python.python = let
raw-package = callPackage ./python {
extractNuGet = callPackage ./python/extract-nuget.nix { };
};
in
buildEnv {
name = "vscode-extension-ms-python-python-full";
paths = [ raw-package self.ms-toolsai.jupyter ];
};
msjsdiag.debugger-for-chrome = buildVscodeMarketplaceExtension {
mktplcRef = {