diff options
| author | Luke Granger-Brown <git@lukegb.com> | 2021-05-08 18:26:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-08 18:26:36 +0100 |
| commit | b2544d1ad274a342620a07b3c795552fab2cc479 (patch) | |
| tree | 661236112a16b28ef14ddbd3a4ec00ae87f6300b /pkgs/misc/vscode-extensions | |
| parent | 497084577eedf2dccc1a90662458f9a204864c80 (diff) | |
| parent | b71773ee0762dd3b4b6a946d670c7d72cfd0e3cd (diff) | |
| download | nixpkgs-b2544d1ad274a342620a07b3c795552fab2cc479.tar nixpkgs-b2544d1ad274a342620a07b3c795552fab2cc479.tar.gz nixpkgs-b2544d1ad274a342620a07b3c795552fab2cc479.tar.bz2 nixpkgs-b2544d1ad274a342620a07b3c795552fab2cc479.tar.lz nixpkgs-b2544d1ad274a342620a07b3c795552fab2cc479.tar.xz nixpkgs-b2544d1ad274a342620a07b3c795552fab2cc479.tar.zst nixpkgs-b2544d1ad274a342620a07b3c795552fab2cc479.zip | |
Merge pull request #121072 from kinnison/update-vscode-python
Update vscode python
Diffstat (limited to 'pkgs/misc/vscode-extensions')
| -rw-r--r-- | pkgs/misc/vscode-extensions/default.nix | 26 | ||||
| -rw-r--r-- | pkgs/misc/vscode-extensions/python/default.nix | 4 |
2 files changed, 24 insertions, 6 deletions
diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index b392e0348f8..7d53fcb31ee 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 = { @@ -718,6 +724,18 @@ let }; }; + ms-toolsai.jupyter = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "jupyter"; + publisher = "ms-toolsai"; + version = "2021.5.745244803"; + sha256 = "0gjpsp61l8daqa87mpmxcrvsvb0pc2vwg7xbkvwn0f13c1739w9p"; + }; + meta = { + license = lib.licenses.unfree; + }; + }; + naumovs.color-highlight = buildVscodeMarketplaceExtension { mktplcRef = { name = "color-highlight"; diff --git a/pkgs/misc/vscode-extensions/python/default.nix b/pkgs/misc/vscode-extensions/python/default.nix index 1d86f82d278..e9e4b9f0cfc 100644 --- a/pkgs/misc/vscode-extensions/python/default.nix +++ b/pkgs/misc/vscode-extensions/python/default.nix @@ -41,13 +41,13 @@ in vscode-utils.buildVscodeMarketplaceExtension rec { mktplcRef = { name = "python"; publisher = "ms-python"; - version = "2020.9.114305"; + version = "2021.4.765268190"; }; vsix = fetchurl { name = "${mktplcRef.publisher}-${mktplcRef.name}.zip"; url = "https://github.com/microsoft/vscode-python/releases/download/${mktplcRef.version}/ms-python-release.vsix"; - sha256 = "1vh0wvfvzszc58lw7dbl60knpm5l6rrsghfchhn5dvwyadx4a33h"; + sha256 = "0x7dn3vc83mph2gaxgx26bn7g71hqdpp1mpizmd4jqcrknc4d7ci"; }; buildInputs = [ |