diff options
author | Alyssa Ross <hi@alyssa.is> | 2024-05-21 11:19:54 +0200 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2024-05-21 11:19:54 +0200 |
commit | 1f7ea1acad1207378e325dd0d6527a983d7192b5 (patch) | |
tree | 38c0985697418e959e9c872b1afde54f9e6880f2 /nixpkgs/pkgs/applications/editors/vscode | |
parent | a4ffc889571c7100467c7aa1ccae5a4d8373089f (diff) | |
parent | 6c0b7a92c30122196a761b440ac0d46d3d9954f1 (diff) | |
download | nixlib-1f7ea1acad1207378e325dd0d6527a983d7192b5.tar nixlib-1f7ea1acad1207378e325dd0d6527a983d7192b5.tar.gz nixlib-1f7ea1acad1207378e325dd0d6527a983d7192b5.tar.bz2 nixlib-1f7ea1acad1207378e325dd0d6527a983d7192b5.tar.lz nixlib-1f7ea1acad1207378e325dd0d6527a983d7192b5.tar.xz nixlib-1f7ea1acad1207378e325dd0d6527a983d7192b5.tar.zst nixlib-1f7ea1acad1207378e325dd0d6527a983d7192b5.zip |
Merge remote-tracking branch 'nixpkgs/nixos-unstable'
Diffstat (limited to 'nixpkgs/pkgs/applications/editors/vscode')
12 files changed, 129 insertions, 42 deletions
diff --git a/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix b/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix index 260711bd4880..fad42392d45e 100644 --- a/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix +++ b/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix @@ -90,8 +90,8 @@ let mktplcRef = { publisher = "42Crunch"; name = "vscode-openapi"; - version = "4.25.1"; - sha256 = "+hKQUJp9c0oyhePFmQEXAqtqKL3fkQ1nhopUPnhRZc4="; + version = "4.25.3"; + hash = "sha256-1kz/M2od2gLSFgqW6LsPHgtm+BwXA+0+7z3HyqNmsOg="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/42Crunch.vscode-openapi/changelog"; @@ -406,8 +406,8 @@ let mktplcRef = { name = "vscode-neovim"; publisher = "asvetliakov"; - version = "1.8.1"; - sha256 = "0kqzry0cbvvy1pkbx5rhnk5ry7j91cbf11vz1s1jrqc7j0hq0yx8"; + version = "1.11.4"; + hash = "sha256-dAovrYfA5muPNhFIHycxuO0CIWPT4T9hsEzri1JDOUI="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/asvetliakov.vscode-neovim/changelog"; @@ -1477,8 +1477,8 @@ let mktplcRef = { name = "elixir-ls"; publisher = "JakeBecker"; - version = "0.20.0"; - hash = "sha256-p+YNBRzzA/EezBMxI5Rmdb8SdJgFV7QwuLVi1mcJV+E="; + version = "0.21.1"; + hash = "sha256-z/GhynjkoEcaRp59tYr1lnM5vfV0OaDCcCpC02OdVLE="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/JakeBecker.elixir-ls/changelog"; @@ -2205,8 +2205,8 @@ let mktplcRef = { name = "Ionide-fsharp"; publisher = "Ionide"; - version = "7.18.2"; - hash = "sha256-CEeTLiZktp5YzCRxDXa+s8W9N971iQla/FyCr8Co0SQ="; + version = "7.19.1"; + hash = "sha256-QyGt3q00IEXw6YNvx7pFhLS1s44aeiB/U0m3Ow1UdlM="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/Ionide.Ionide-fsharp/changelog"; @@ -2234,6 +2234,27 @@ let }; }; + jackmacwindows.vscode-computercraft = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-computercraft"; + publisher = "jackmacwindows"; + version = "1.1.1"; + hash = "sha256-ec1I3oQ06iMdSUcqf8yA3GjE7Aqa0PiLzRQLwFcL0KU="; + }; + postInstall = '' + # Remove superflouous images to reduce closure size + rm $out/$installPrefix/images/*.gif + ''; + meta = { + changelog = "https://marketplace.visualstudio.com/items/jackmacwindows.vscode-computercraft/changelog"; + description = "A Visual Studio Code extension for ComputerCraft and CC: Tweaked auto-completion"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=jackmacwindows.vscode-computercraft"; + homepage = "https://github.com/MCJack123/vscode-computercraft"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ tomodachi94 ]; + }; + }; + jackmacwindows.craftos-pc = callPackage ./jackmacwindows.craftos-pc { }; james-yu.latex-workshop = buildVscodeMarketplaceExtension { @@ -2857,8 +2878,8 @@ let mktplcRef = { name = "debugpy"; publisher = "ms-python"; - version = "2023.3.13121011"; - hash = "sha256-owYUEyQl2FQytApfuI97N4y9p7/dL0lu6EBk/AzSMjw="; + version = "2024.6.0"; + hash = "sha256-VlPe65ViBur5P6L7iRKdGnmbNlSCwYrdZAezStx8Bz8="; }; meta = { description = "Python debugger (debugpy) extension for VS Code"; @@ -4094,6 +4115,8 @@ let }; }; + tekumara.typos-vscode = callPackage ./tekumara.typos-vscode { }; + theangryepicbanana.language-pascal = buildVscodeMarketplaceExtension { mktplcRef = { name = "language-pascal"; diff --git a/nixpkgs/pkgs/applications/editors/vscode/extensions/jackmacwindows.craftos-pc/default.nix b/nixpkgs/pkgs/applications/editors/vscode/extensions/jackmacwindows.craftos-pc/default.nix index 005f78f4f4ae..27f091d5110f 100644 --- a/nixpkgs/pkgs/applications/editors/vscode/extensions/jackmacwindows.craftos-pc/default.nix +++ b/nixpkgs/pkgs/applications/editors/vscode/extensions/jackmacwindows.craftos-pc/default.nix @@ -10,8 +10,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "craftos-pc"; publisher = "jackmacwindows"; - version = "1.2.2"; - hash = "sha256-A+MNroXv0t9Mw/gr0Fyov3cXyF/GGzwRLKrIxQ2tKCE="; + version = "1.2.3"; + hash = "sha256-QoLMefSmownw9AEem0jx1+BF1bcolHYpiqyPKQNkdiQ="; }; nativeBuildInputs = [ jq diff --git a/nixpkgs/pkgs/applications/editors/vscode/extensions/mgt19937.typst-preview/default.nix b/nixpkgs/pkgs/applications/editors/vscode/extensions/mgt19937.typst-preview/default.nix index 156e35ab06a0..615589bf8dd7 100644 --- a/nixpkgs/pkgs/applications/editors/vscode/extensions/mgt19937.typst-preview/default.nix +++ b/nixpkgs/pkgs/applications/editors/vscode/extensions/mgt19937.typst-preview/default.nix @@ -12,8 +12,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "typst-preview"; publisher = "mgt19937"; - version = "0.11.4"; - hash = "sha256-GwlzFphZmP87pLys01+PWTv13imcdGjunCMH6atz9xs="; + version = "0.11.6"; + hash = "sha256-8//6eUzMg5AX9NNQm5mzNGlOG50Cxl0Rt1+dPq0J2DU="; }; buildInputs = [ typst-preview ]; diff --git a/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix b/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix index 67a96652b6ed..35bc6cdcef23 100644 --- a/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix +++ b/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix @@ -21,8 +21,8 @@ vscode-utils.buildVscodeMarketplaceExtension rec { mktplcRef = { name = "python"; publisher = "ms-python"; - version = "2023.1.10091012"; - hash = "sha256-JosFv6ngJmw1XRILwTZMVxlGIdWFLFQjj4olfnVwAIM="; + version = "2024.5.11021008"; + hash = "sha256-UnI0leRKqCtFLBdGS/UvLuCcxQhibyY0ChmzQ9uytoY="; }; buildInputs = [ icu ]; @@ -37,11 +37,11 @@ vscode-utils.buildVscodeMarketplaceExtension rec { postPatch = '' # remove bundled python deps and use libs from nixpkgs - rm -r pythonFiles/lib - mkdir -p pythonFiles/lib/python/ - ln -s ${python3.pkgs.debugpy}/lib/*/site-packages/debugpy pythonFiles/lib/python/ + rm -r python_files/lib + mkdir -p python_files/lib/python/ + ln -s ${python3.pkgs.debugpy}/lib/*/site-packages/debugpy python_files/lib/python/ buildPythonPath "$propagatedBuildInputs" - for i in pythonFiles/*.py; do + for i in python_files/*.py; do patchPythonScript "$i" done '' diff --git a/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-python.vscode-pylance/default.nix b/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-python.vscode-pylance/default.nix index 9b7f63edc74a..ad8c6a9eac46 100644 --- a/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-python.vscode-pylance/default.nix +++ b/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-python.vscode-pylance/default.nix @@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-pylance"; publisher = "MS-python"; - version = "2024.4.1"; - hash = "sha256-huKu6yefGXOay5Az4vksopRt8heoLxvKUrg/J1NlQFo="; + version = "2024.5.1"; + hash = "sha256-w+T4dySTt2RpdBYd1Nnxh8RR9wqEu9pkS4R1Ay7Fn+8="; }; buildInputs = [ pyright ]; diff --git a/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix b/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix index 731bddc3553c..20c38168178b 100644 --- a/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix +++ b/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix @@ -43,11 +43,11 @@ let gdbDefaultsTo = if gdbUseFixed then "${gdb}/bin/gdb" else "gdb"; supported = { x86_64-linux = { - hash = "sha256-p8WFmkQKdzXF0FTWHabyeFMkwXa2RkDRM9SvvkBIOLY="; + hash = "sha256-arTBt3UWA5zoo0dL044Sx/NT1LUS76XfGIS96NOMvJk="; arch = "linux-x64"; }; aarch64-linux = { - hash = "sha256-HISE8/M9IpeI8iX0mmw9owExnpgiwpesE7YG/+QFYgc="; + hash = "sha256-oVuDxx117bVd/jDqn9KivTwR5T2X5UZMHk/nZ/e/IOg="; arch = "linux-arm64"; }; }; @@ -58,7 +58,7 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = base // { name = "cpptools"; publisher = "ms-vscode"; - version = "1.20.2"; + version = "1.20.5"; }; nativeBuildInputs = [ @@ -105,9 +105,9 @@ vscode-utils.buildVscodeMarketplaceExtension { description = "The C/C++ extension adds language support for C/C++ to Visual Studio Code, including features such as IntelliSense and debugging."; homepage = "https://marketplace.visualstudio.com/items?itemName=ms-vscode.cpptools"; license = lib.licenses.unfree; - maintainers = [ - lib.maintainers.jraygauthier - lib.maintainers.stargate01 + maintainers = with lib.maintainers; [ + jraygauthier + stargate01 ]; platforms = [ "x86_64-linux" diff --git a/nixpkgs/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix b/nixpkgs/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix index 3a6d84b24b8a..21a412b91e31 100644 --- a/nixpkgs/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix +++ b/nixpkgs/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix @@ -12,8 +12,8 @@ vscode-utils.buildVscodeMarketplaceExtension { publisher = "myriad-dreamin"; # Please update the corresponding binary (tinymist) when updating # this extension. - version = "0.11.6"; - hash = "sha256-qS+QY9RmJYXWRcohMcorF3SxoniBPE8SFcg0Ka1vvOE="; + version = "0.11.9"; + hash = "sha256-h49SI/KoA5sbLIkJreZoux7mTIhGZ7HqtgE1EAh3vYM="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/editors/vscode/extensions/reditorsupport.r/default.nix b/nixpkgs/pkgs/applications/editors/vscode/extensions/reditorsupport.r/default.nix index de1759d7b0e4..c2c2217762ef 100644 --- a/nixpkgs/pkgs/applications/editors/vscode/extensions/reditorsupport.r/default.nix +++ b/nixpkgs/pkgs/applications/editors/vscode/extensions/reditorsupport.r/default.nix @@ -12,8 +12,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "r"; publisher = "reditorsupport"; - version = "2.8.2"; - hash = "sha256-FPL/JjW452KRchcQ0iHXRJarZXvS3B8PvZhXjf3rMhQ="; + version = "2.8.4"; + hash = "sha256-wVT9/JUuqP8whW99q1gwVMf7PRzgZNLoIdlXsclpbck="; }; nativeBuildInputs = [ jq diff --git a/nixpkgs/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix b/nixpkgs/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix new file mode 100644 index 000000000000..140a371efd45 --- /dev/null +++ b/nixpkgs/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix @@ -0,0 +1,64 @@ +{ + stdenv, + jq, + lib, + moreutils, + typos-lsp, + vscode-utils, +}: +let + inherit (stdenv.hostPlatform) system; + + extInfo = + { + x86_64-linux = { + arch = "linux-x64"; + hash = "sha256-CPUlJ1QzGiZKd4r46Iioc5svw0oLsMsYnc0KxT1p0zM="; + }; + aarch64-linux = { + arch = "linux-arm64"; + hash = "sha256-qSTCZHL7nfB300qwuqgl/4u+SYNMA2BFCrD+yQEgN/c="; + }; + x86_64-darwin = { + arch = "darwin-x64"; + hash = "sha256-FcZH2bB5B3wnu6F76kGp9FBdD3yZtr57TQ5xaUfRcmY="; + }; + aarch64-darwin = { + arch = "darwin-arm64"; + hash = "sha256-3HdK4x2WNdb9Zxqjtn9lmbgrMOzz14rH0ZF0x9B0BHY="; + }; + } + .${system} or (throw "Unsupported system: ${system}"); +in +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "typos-vscode"; + publisher = "tekumara"; + # Please update the corresponding binary (typos-lsp) + # when updating this extension. + # See pkgs/by-name/ty/typos-lsp/package.nix + version = "0.1.18"; + inherit (extInfo) hash arch; + }; + + nativeBuildInputs = [ + jq + moreutils + ]; + + buildInputs = [ typos-lsp ]; + + postInstall = '' + cd "$out/$installPrefix" + jq '.contributes.configuration.properties."typos.path".default = "${lib.getExe typos-lsp}"' package.json | sponge package.json + ''; + + meta = { + changelog = "https://marketplace.visualstudio.com/items/tekumara.typos-vscode/changelog"; + description = "A VSCode extension for providing a low false-positive source code spell checker"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=tekumara.typos-vscode"; + homepage = "https://github.com/tekumara/typos-lsp"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.drupol ]; + }; +} diff --git a/nixpkgs/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix b/nixpkgs/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix index 70f4cbd833de..8ed7c0b946b4 100644 --- a/nixpkgs/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix +++ b/nixpkgs/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix @@ -67,7 +67,7 @@ let cp $out/lib/* $out/share/adapter cp -r adapter/scripts $out/share/adapter cp -t $out/share/formatters formatters/*.py - ln -s ${lldb.lib} $out/share/lldb + ln -s ${lib.getLib lldb} $out/share/lldb makeWrapper $out/share/adapter/codelldb $out/bin/codelldb \ --set-default LLDB_DEBUGSERVER_PATH "${lldb.out}/bin/lldb-server" ''; diff --git a/nixpkgs/pkgs/applications/editors/vscode/generic.nix b/nixpkgs/pkgs/applications/editors/vscode/generic.nix index b7fe7d2712a6..5ed75a0ce32e 100644 --- a/nixpkgs/pkgs/applications/editors/vscode/generic.nix +++ b/nixpkgs/pkgs/applications/editors/vscode/generic.nix @@ -165,7 +165,7 @@ in autoPatchelfHook asar # override doesn't preserve splicing https://github.com/NixOS/nixpkgs/issues/132651 - (buildPackages.wrapGAppsHook.override { inherit (buildPackages) makeWrapper; }) + (buildPackages.wrapGAppsHook3.override { inherit (buildPackages) makeWrapper; }) ]; dontBuild = true; diff --git a/nixpkgs/pkgs/applications/editors/vscode/vscode.nix b/nixpkgs/pkgs/applications/editors/vscode/vscode.nix index 3cd3faa79014..e8ff066642b2 100644 --- a/nixpkgs/pkgs/applications/editors/vscode/vscode.nix +++ b/nixpkgs/pkgs/applications/editors/vscode/vscode.nix @@ -30,21 +30,21 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "14m9w7wkg1704apd4d46yi6zwdlbrx2rp3fry9ffk2nn6kkahwk2"; - x86_64-darwin = "1cp74wdkva1zib04wxjby0h8r1c56g893kq5ksdj38404i2c5hdk"; - aarch64-linux = "00yrdmi4c5m8r11gm7vw18qb5ddcwwg5mdk8s9ykzhmxhdrkcarm"; - aarch64-darwin = "1jjhw60jcvj5brayarg8k6avxwaa00mwdn4lrkcdzbzzh1q4knvv"; - armv7l-linux = "1jddc3fsv65mp95ybpprx8sz3mpnp6j2ghp4nflky8iawmzz183v"; + x86_64-linux = "1zfh48g6prjhjcyrz5impsnm6khw7s75k8k54bp0cszl81ddsysx"; + x86_64-darwin = "1w5fzq8dmzrs2ggxvcbcs03psxxi1dbzx5l0jn52szi1g5y3daxi"; + aarch64-linux = "0rs4zzddfpwbf86cjl4r65cxccs4ypz1s7lw98vq0j8pfx8vkgqi"; + aarch64-darwin = "0gha1b6q3k57yrbp7qrrknlbbbbhcjd6slbyrzlwjcz1ddvs7c8s"; + armv7l-linux = "01s1vxbmg3zp47kwlsjr781v6c51l5bcpf9pc91id0qcrhax703k"; }.${system} or throwSystem; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.88.1"; + version = "1.89.1"; pname = "vscode" + lib.optionalString isInsiders "-insiders"; # This is used for VS Code - Remote SSH test - rev = "e170252f762678dec6ca2cc69aba1570769a5d39"; + rev = "dc96b837cf6bb4af9cd736aa3af08cf8279f7685"; executableName = "code" + lib.optionalString isInsiders "-insiders"; longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders"; @@ -68,7 +68,7 @@ in src = fetchurl { name = "vscode-server-${rev}.tar.gz"; url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable"; - sha256 = "100nhm231gzav24lz84vxwxnqkn777kfn0fkkjmdcd30kc7g7ig9"; + sha256 = "05gvq96vw69lb8ip8pfd9g43j8kvfwlrdmm11b41fpdafhi45f89"; }; }; |