From b71773ee0762dd3b4b6a946d670c7d72cfd0e3cd Mon Sep 17 00:00:00 2001 From: Daniel Silverstone Date: Wed, 28 Apr 2021 20:53:53 +0100 Subject: [PATCH] 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 --- pkgs/misc/vscode-extensions/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index a3a2e8dbd068..204da6563109 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -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 = {