cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #145240 from SuperSandro2000/vscode

Browse source 
Vscode
This commit is contained in:
Sandro 2021-11-09 21:33:26 +01:00 committed by GitHub
commit 841b23bd1d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 26 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/misc/vscode-extensions/cpptools/default.nix
View file

@ -5,8 +5,6 @@
, gdbUseFixed ? true, gdb # The gdb default setting will be fixed to specified. Use version from `PATH` otherwise. , 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 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). which could not be fixed merely by patching (inside a C# dll).

14
pkgs/misc/vscode-extensions/default.nix
View file

@ -971,19 +971,19 @@ let
}; };
jnoortheen.nix-ide = buildVscodeMarketplaceExtension { jnoortheen.nix-ide = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "nix-ide";
publisher = "jnoortheen";
version = "0.1.18";
sha256 = "sha256-dmmx/u+hRQfY/MCIaSdcVtbYnf5cLCDUwr75heQxcuw=";
};
meta = with lib; { meta = with lib; {
changelog = "https://marketplace.visualstudio.com/items/jnoortheen.nix-ide/changelog"; changelog = "https://marketplace.visualstudio.com/items/jnoortheen.nix-ide/changelog";
description = "Nix language support with formatting and error report"; description = "Nix language support with formatting and error report";
downloadPage = "https://marketplace.visualstudio.com/items?itemName=jnoortheen.nix-ide"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=jnoortheen.nix-ide";
homepage = "https://github.com/jnoortheen/vscode-nix-ide"; homepage = "https://github.com/jnoortheen/vscode-nix-ide";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ ]; maintainers = with maintainers; [ SuperSandro2000 ];
};
mktplcRef = {
name = "nix-ide";
publisher = "jnoortheen";
version = "0.1.16";
sha256 = "04ky1mzyjjr1mrwv3sxz4mgjcq5ylh6n01lvhb19h3fmwafkdxbp";
}; };
}; };

39
pkgs/misc/vscode-extensions/remote-ssh/default.nix
View file

@ -1,6 +1,7 @@
{ lib { lib
, vscode-utils , vscode-utils
, useLocalExtensions ? false}: , useLocalExtensions ? false
}:
# Note that useLocalExtensions requires that vscode-server is not running # Note that useLocalExtensions requires that vscode-server is not running
# on host. If it is, you'll need to remove $HOME/.vscode-server, # on host. If it is, you'll need to remove $HOME/.vscode-server,
# and redo the install by running "Connect to host" on client # and redo the install by running "Connect to host" on client
@ -32,24 +33,22 @@ let
''} ''}
''; '';
in in
buildVscodeMarketplaceExtension { buildVscodeMarketplaceExtension {
mktplcRef = { mktplcRef = {
name = "remote-ssh"; name = "remote-ssh";
publisher = "ms-vscode-remote"; publisher = "ms-vscode-remote";
version = "0.65.7"; version = "0.66.1";
sha256 = "ae86c4be79fc5af747bb1f1aa5841221af80ee7476cc2f1c9ac277fa2fa1d683"; sha256 = "sha256-+v4UnGRG5xOc8k0IzvHUBHa128fhgd3jcmEuciiMQmI=";
}; };
postPatch = '' postPatch = ''
substituteInPlace "out/extension.js" \ substituteInPlace "out/extension.js" \
--replace "# install extensions" '${patch}' --replace "# install extensions" '${patch}'
''; '';
meta = with lib; { meta = with lib; {
description ="Use any remote machine with a SSH server as your development environment."; description = "Use any remote machine with a SSH server as your development environment.";
license = licenses.unfree; license = licenses.unfree;
maintainers = with maintainers; [ maintainers = with maintainers; [ SuperSandro2000 tbenst ];
tbenst };
]; }
};
}