diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-07-10 15:51:20 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-07-10 15:51:20 +0200 |
| commit | f8701caafc26f2df17ab44fd4a2511c1dc11f9bf (patch) | |
| tree | a63c326409d7795cbb5dd310eb0b882b86724449 /pkgs/misc | |
| parent | 99afb5d4c73265793680360d67bc3b16b0062610 (diff) | |
| parent | 2698bb461fe36069a0bcfeec52d7c99eb476b134 (diff) | |
| download | nixlib-f8701caafc26f2df17ab44fd4a2511c1dc11f9bf.tar nixlib-f8701caafc26f2df17ab44fd4a2511c1dc11f9bf.tar.gz nixlib-f8701caafc26f2df17ab44fd4a2511c1dc11f9bf.tar.bz2 nixlib-f8701caafc26f2df17ab44fd4a2511c1dc11f9bf.tar.lz nixlib-f8701caafc26f2df17ab44fd4a2511c1dc11f9bf.tar.xz nixlib-f8701caafc26f2df17ab44fd4a2511c1dc11f9bf.tar.zst nixlib-f8701caafc26f2df17ab44fd4a2511c1dc11f9bf.zip | |
Merge master into staging
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/vscode-extensions/cpptools/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/misc/vscode-extensions/python/default.nix | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/misc/vscode-extensions/cpptools/default.nix b/pkgs/misc/vscode-extensions/cpptools/default.nix index c29611c0c662..6cec206b73a4 100644 --- a/pkgs/misc/vscode-extensions/cpptools/default.nix +++ b/pkgs/misc/vscode-extensions/cpptools/default.nix @@ -67,8 +67,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "cpptools"; publisher = "ms-vscode"; - version = "0.16.1"; - sha256 = "0m4cam8sf3zwp8ss1dii908g7rc8b9l6pry0dglg0rmf45pkiaj3"; + version = "0.17.6"; + sha256 = "2625be8b922ffc199e1c776f784d39b6e004523212f7956c93ae40f9040ce6d5"; }; buildInputs = [ diff --git a/pkgs/misc/vscode-extensions/python/default.nix b/pkgs/misc/vscode-extensions/python/default.nix index 430ce192ed0d..41db2c1fcea3 100644 --- a/pkgs/misc/vscode-extensions/python/default.nix +++ b/pkgs/misc/vscode-extensions/python/default.nix @@ -1,9 +1,9 @@ { stdenv, lib, vscode-utils -, pythonUseFixed ? false, python # When `true`, the python default setting will be fixed to specified. +, pythonUseFixed ? false, python # When `true`, the python default setting will be fixed to specified. # Use version from `PATH` for default setting otherwise. # Defaults to `false` as we expect it to be project specific most of the time. -, ctagsUseFixed ? true, ctags # When `true`, the ctags default setting will be fixed to specified. +, ctagsUseFixed ? true, ctags # When `true`, the ctags default setting will be fixed to specified. # Use version from `PATH` for default setting otherwise. # Defaults to `true` as usually not defined on a per projet basis. }: @@ -20,8 +20,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "python"; publisher = "ms-python"; - version = "0.8.0"; - sha256 = "0i7s93l5g5lyi6vn77zh3ipj0p267y17fayv6vjrxc2igrs27ik6"; + version = "2018.6.0"; + sha256 = "a157399b45b40caa9e0b3432eaf3e7444ee4cb91497c139bcb740d42d61f9ae8"; }; postPatch = '' |