From 182a344607e3ca8c2f26faaafeac7606d9b5c9a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 9 Nov 2021 20:50:10 +0100 Subject: [PATCH 1/3] cpptools: remove outdated assert --- pkgs/misc/vscode-extensions/cpptools/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/misc/vscode-extensions/cpptools/default.nix b/pkgs/misc/vscode-extensions/cpptools/default.nix index 559cb70b3879..003846fb2c43 100644 --- a/pkgs/misc/vscode-extensions/cpptools/default.nix +++ b/pkgs/misc/vscode-extensions/cpptools/default.nix @@ -5,8 +5,6 @@ , gdbUseFixed ? true, gdb # The gdb default setting will be fixed to specified. Use version from `PATH` otherwise. }: -assert gdbUseFixed -> null != gdb; - /* Note that this version of the extension still has some nix specific issues which could not be fixed merely by patching (inside a C# dll). From 08cbc1bf9ed54e53d167938569f75a7dd38f58b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 9 Nov 2021 20:53:10 +0100 Subject: [PATCH 2/3] vscode-extensions.jnoortheen.nix-ide: 0.1.16 -> 0.1.18 & adopt --- pkgs/misc/vscode-extensions/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 5085bfe91957..10fe88c06f11 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -971,19 +971,19 @@ let }; jnoortheen.nix-ide = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "nix-ide"; + publisher = "jnoortheen"; + version = "0.1.18"; + sha256 = "sha256-dmmx/u+hRQfY/MCIaSdcVtbYnf5cLCDUwr75heQxcuw="; + }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/jnoortheen.nix-ide/changelog"; description = "Nix language support with formatting and error report"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=jnoortheen.nix-ide"; homepage = "https://github.com/jnoortheen/vscode-nix-ide"; license = licenses.mit; - maintainers = with maintainers; [ ]; - }; - mktplcRef = { - name = "nix-ide"; - publisher = "jnoortheen"; - version = "0.1.16"; - sha256 = "04ky1mzyjjr1mrwv3sxz4mgjcq5ylh6n01lvhb19h3fmwafkdxbp"; + maintainers = with maintainers; [ SuperSandro2000 ]; }; }; From 580374635d73a5b0ec737f43842c5d39f3611a26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 9 Nov 2021 20:54:11 +0100 Subject: [PATCH 3/3] vscode-extensions.ms-vscode-remote.remote-ssh: 0.65.7 -> 0.66.1 --- .../vscode-extensions/remote-ssh/default.nix | 39 +++++++++---------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/pkgs/misc/vscode-extensions/remote-ssh/default.nix b/pkgs/misc/vscode-extensions/remote-ssh/default.nix index ab59527d82bc..3bfc94bb6ea4 100644 --- a/pkgs/misc/vscode-extensions/remote-ssh/default.nix +++ b/pkgs/misc/vscode-extensions/remote-ssh/default.nix @@ -1,6 +1,7 @@ { lib , vscode-utils -, useLocalExtensions ? false}: +, useLocalExtensions ? false +}: # Note that useLocalExtensions requires that vscode-server is not running # on host. If it is, you'll need to remove $HOME/.vscode-server, # and redo the install by running "Connect to host" on client @@ -32,24 +33,22 @@ let ''} ''; in - buildVscodeMarketplaceExtension { - mktplcRef = { - name = "remote-ssh"; - publisher = "ms-vscode-remote"; - version = "0.65.7"; - sha256 = "ae86c4be79fc5af747bb1f1aa5841221af80ee7476cc2f1c9ac277fa2fa1d683"; - }; +buildVscodeMarketplaceExtension { + mktplcRef = { + name = "remote-ssh"; + publisher = "ms-vscode-remote"; + version = "0.66.1"; + sha256 = "sha256-+v4UnGRG5xOc8k0IzvHUBHa128fhgd3jcmEuciiMQmI="; + }; - postPatch = '' - substituteInPlace "out/extension.js" \ - --replace "# install extensions" '${patch}' - ''; + postPatch = '' + substituteInPlace "out/extension.js" \ + --replace "# install extensions" '${patch}' + ''; - meta = with lib; { - description ="Use any remote machine with a SSH server as your development environment."; - license = licenses.unfree; - maintainers = with maintainers; [ - tbenst - ]; - }; - } + meta = with lib; { + description = "Use any remote machine with a SSH server as your development environment."; + license = licenses.unfree; + maintainers = with maintainers; [ SuperSandro2000 tbenst ]; + }; +}