From e5005453d3315aa58a04b901cbecbef5e241f7b1 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Sat, 18 Mar 2023 15:54:49 -0300 Subject: [PATCH] vscode-extensions: refactor of extensions (#221878) * vscode-extensions: fix indentation for editorconfig * vscode-extensions.chenglou92.rescript-vscode: renamed directory * vscode-extensions.WakaTime.vscode-wakatime: rename directory * vscode-extensions.hashicorp.terraform: rename directory * vscode-extensions.ms-python.python: rename directory * vscode-extensions.sumneko.lua: rename directory * vscode-extensions.ms-vscode.cpptools: rename directory * vscode-extensions.ms-vscode-remote.remote-ssh: rename directory * vscode-extensions.rust-lang.rust-analyzer: rename directory * vscode-extensions.vadimcn.vscode-lldb: rename directory * vscode-extensions.ms-dotnettools.csharp: rename directory * vscode-extensions.ms-vsliveshare.vsliveshare: rename directory * vscode-extensions.ms-toolsai.jupyter: rename directory --- .../default.nix | 0 .../default.nix | 0 .../rescript-editor-analysis.nix | 0 .../editors/vscode/extensions/default.nix | 30 +++++++++---------- .../default.nix | 0 .../fix-terraform-ls.patch | 0 .../default.nix | 0 .../{python => ms-python.python}/default.nix | 0 .../default.nix | 0 .../default.nix | 0 .../default.nix | 0 .../missing_elf_deps.sh | 0 .../package-activation-events.json | 0 .../update_helper.sh | 0 .../default.nix | 0 .../build-deps/package.json | 0 .../default.nix | 0 .../update.sh | 0 .../{lua => sumneko.lua}/default.nix | 0 .../{lua => sumneko.lua}/remove-chmod.patch | 0 .../build-deps/default.nix | 0 .../build-deps/node-env.nix | 0 .../build-deps/node-packages.nix | 0 .../cmake-build-extension-only.patch | 0 .../default.nix | 0 .../fix-python-installation.patch | 0 .../lldb.nix | 0 .../update.sh | 0 .../vscode/extensions/vscode-utils.nix | 4 +-- 29 files changed, 17 insertions(+), 17 deletions(-) rename pkgs/applications/editors/vscode/extensions/{wakatime => WakaTime.vscode-wakatime}/default.nix (100%) rename pkgs/applications/editors/vscode/extensions/{rescript => chenglou92.rescript-vscode}/default.nix (100%) rename pkgs/applications/editors/vscode/extensions/{rescript => chenglou92.rescript-vscode}/rescript-editor-analysis.nix (100%) rename pkgs/applications/editors/vscode/extensions/{terraform => hashicorp.terraform}/default.nix (100%) rename pkgs/applications/editors/vscode/extensions/{terraform => hashicorp.terraform}/fix-terraform-ls.patch (100%) rename pkgs/applications/editors/vscode/extensions/{ms-dotnettools-csharp => ms-dotnettools.csharp}/default.nix (100%) rename pkgs/applications/editors/vscode/extensions/{python => ms-python.python}/default.nix (100%) rename pkgs/applications/editors/vscode/extensions/{ms-toolsai-jupyter => ms-toolsai.jupyter}/default.nix (100%) rename pkgs/applications/editors/vscode/extensions/{remote-ssh => ms-vscode-remote.remote-ssh}/default.nix (100%) rename pkgs/applications/editors/vscode/extensions/{cpptools => ms-vscode.cpptools}/default.nix (100%) rename pkgs/applications/editors/vscode/extensions/{cpptools => ms-vscode.cpptools}/missing_elf_deps.sh (100%) rename pkgs/applications/editors/vscode/extensions/{cpptools => ms-vscode.cpptools}/package-activation-events.json (100%) rename pkgs/applications/editors/vscode/extensions/{cpptools => ms-vscode.cpptools}/update_helper.sh (100%) rename pkgs/applications/editors/vscode/extensions/{ms-vsliveshare-vsliveshare => ms-vsliveshare.vsliveshare}/default.nix (100%) rename pkgs/applications/editors/vscode/extensions/{rust-analyzer => rust-lang.rust-analyzer}/build-deps/package.json (100%) rename pkgs/applications/editors/vscode/extensions/{rust-analyzer => rust-lang.rust-analyzer}/default.nix (100%) rename pkgs/applications/editors/vscode/extensions/{rust-analyzer => rust-lang.rust-analyzer}/update.sh (100%) rename pkgs/applications/editors/vscode/extensions/{lua => sumneko.lua}/default.nix (100%) rename pkgs/applications/editors/vscode/extensions/{lua => sumneko.lua}/remove-chmod.patch (100%) rename pkgs/applications/editors/vscode/extensions/{vscode-lldb => vadimcn.vscode-lldb}/build-deps/default.nix (100%) rename pkgs/applications/editors/vscode/extensions/{vscode-lldb => vadimcn.vscode-lldb}/build-deps/node-env.nix (100%) rename pkgs/applications/editors/vscode/extensions/{vscode-lldb => vadimcn.vscode-lldb}/build-deps/node-packages.nix (100%) rename pkgs/applications/editors/vscode/extensions/{vscode-lldb => vadimcn.vscode-lldb}/cmake-build-extension-only.patch (100%) rename pkgs/applications/editors/vscode/extensions/{vscode-lldb => vadimcn.vscode-lldb}/default.nix (100%) rename pkgs/applications/editors/vscode/extensions/{vscode-lldb => vadimcn.vscode-lldb}/fix-python-installation.patch (100%) rename pkgs/applications/editors/vscode/extensions/{vscode-lldb => vadimcn.vscode-lldb}/lldb.nix (100%) rename pkgs/applications/editors/vscode/extensions/{vscode-lldb => vadimcn.vscode-lldb}/update.sh (100%) diff --git a/pkgs/applications/editors/vscode/extensions/wakatime/default.nix b/pkgs/applications/editors/vscode/extensions/WakaTime.vscode-wakatime/default.nix similarity index 100% rename from pkgs/applications/editors/vscode/extensions/wakatime/default.nix rename to pkgs/applications/editors/vscode/extensions/WakaTime.vscode-wakatime/default.nix diff --git a/pkgs/applications/editors/vscode/extensions/rescript/default.nix b/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/default.nix similarity index 100% rename from pkgs/applications/editors/vscode/extensions/rescript/default.nix rename to pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/default.nix diff --git a/pkgs/applications/editors/vscode/extensions/rescript/rescript-editor-analysis.nix b/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/rescript-editor-analysis.nix similarity index 100% rename from pkgs/applications/editors/vscode/extensions/rescript/rescript-editor-analysis.nix rename to pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/rescript-editor-analysis.nix diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 82087a7d2c2e..a888eb3695f4 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -635,7 +635,7 @@ let }; }; - chenglou92.rescript-vscode = callPackage ./rescript { }; + chenglou92.rescript-vscode = callPackage ./chenglou92.rescript-vscode { }; christian-kohler.path-intellisense = buildVscodeMarketplaceExtension { mktplcRef = { @@ -1416,7 +1416,7 @@ let }; }; - hashicorp.terraform = callPackage ./terraform { }; + hashicorp.terraform = callPackage ./hashicorp.terraform { }; hookyqr.beautify = buildVscodeMarketplaceExtension { mktplcRef = { @@ -1930,7 +1930,7 @@ let ms-ceintl = callPackage ./language-packs.nix {}; # non-English language packs - ms-dotnettools.csharp = callPackage ./ms-dotnettools-csharp { }; + ms-dotnettools.csharp = callPackage ./ms-dotnettools.csharp { }; ms-kubernetes-tools.vscode-kubernetes-tools = buildVscodeMarketplaceExtension { mktplcRef = { @@ -1944,7 +1944,7 @@ let }; }; - ms-vscode.cpptools = callPackage ./cpptools { }; + ms-vscode.cpptools = callPackage ./ms-vscode.cpptools { }; ms-vscode.cmake-tools = buildVscodeMarketplaceExtension { mktplcRef = { @@ -1996,7 +1996,7 @@ let }; }; - ms-vscode-remote.remote-ssh = callPackage ./remote-ssh { }; + ms-vscode-remote.remote-ssh = callPackage ./ms-vscode-remote.remote-ssh { }; ms-vscode.theme-tomorrowkit = buildVscodeMarketplaceExtension { mktplcRef = { @@ -2031,7 +2031,7 @@ let }; }; - ms-python.python = callPackage ./python { }; + ms-python.python = callPackage ./ms-python.python { }; msjsdiag.debugger-for-chrome = buildVscodeMarketplaceExtension { mktplcRef = { @@ -2069,7 +2069,7 @@ let }; }; - ms-toolsai.jupyter = callPackage ./ms-toolsai-jupyter {}; + ms-toolsai.jupyter = callPackage ./ms-toolsai.jupyter {}; ms-toolsai.jupyter-keymap = buildVscodeMarketplaceExtension { mktplcRef = { @@ -2257,7 +2257,7 @@ let }; }; - rust-lang.rust-analyzer = callPackage ./rust-analyzer { }; + rust-lang.rust-analyzer = callPackage ./rust-lang.rust-analyzer { }; matklad.rust-analyzer = self.rust-lang.rust-analyzer; # Previous publisher ocamllabs.ocaml-platform = buildVscodeMarketplaceExtension { @@ -2648,7 +2648,7 @@ let }; }; - sumneko.lua = callPackage ./lua { }; + sumneko.lua = callPackage ./sumneko.lua { }; svelte.svelte-vscode = buildVscodeMarketplaceExtension { mktplcRef = { @@ -2858,7 +2858,7 @@ let }; }; - vadimcn.vscode-lldb = callPackage ./vscode-lldb { llvmPackages = llvmPackages_14; }; + vadimcn.vscode-lldb = callPackage ./vadimcn.vscode-lldb { llvmPackages = llvmPackages_14; }; valentjn.vscode-ltex = vscode-utils.buildVscodeMarketplaceExtension rec { mktplcRef = { @@ -2868,9 +2868,9 @@ let }; vsix = fetchurl { - name = "${mktplcRef.publisher}-${mktplcRef.name}.zip"; - url = "https://github.com/valentjn/vscode-ltex/releases/download/${mktplcRef.version}/vscode-ltex-${mktplcRef.version}-offline-linux-x64.vsix"; - sha256 = "1nlrijjwc35n1xgb5lgnr4yvlgfcxd0vdj93ip8lv2xi8x1ni5f6"; + name = "${mktplcRef.publisher}-${mktplcRef.name}.zip"; + url = "https://github.com/valentjn/vscode-ltex/releases/download/${mktplcRef.version}/vscode-ltex-${mktplcRef.version}-offline-linux-x64.vsix"; + sha256 = "1nlrijjwc35n1xgb5lgnr4yvlgfcxd0vdj93ip8lv2xi8x1ni5f6"; }; nativeBuildInputs = [ jq moreutils ]; @@ -2914,7 +2914,7 @@ let }; }; - ms-vsliveshare.vsliveshare = callPackage ./ms-vsliveshare-vsliveshare { }; + ms-vsliveshare.vsliveshare = callPackage ./ms-vsliveshare.vsliveshare { }; vscjava.vscode-java-debug = buildVscodeMarketplaceExtension { mktplcRef = { @@ -3119,7 +3119,7 @@ let }; }; - WakaTime.vscode-wakatime = callPackage ./wakatime { }; + WakaTime.vscode-wakatime = callPackage ./WakaTime.vscode-wakatime { }; wingrunr21.vscode-ruby = buildVscodeMarketplaceExtension { mktplcRef = { diff --git a/pkgs/applications/editors/vscode/extensions/terraform/default.nix b/pkgs/applications/editors/vscode/extensions/hashicorp.terraform/default.nix similarity index 100% rename from pkgs/applications/editors/vscode/extensions/terraform/default.nix rename to pkgs/applications/editors/vscode/extensions/hashicorp.terraform/default.nix diff --git a/pkgs/applications/editors/vscode/extensions/terraform/fix-terraform-ls.patch b/pkgs/applications/editors/vscode/extensions/hashicorp.terraform/fix-terraform-ls.patch similarity index 100% rename from pkgs/applications/editors/vscode/extensions/terraform/fix-terraform-ls.patch rename to pkgs/applications/editors/vscode/extensions/hashicorp.terraform/fix-terraform-ls.patch diff --git a/pkgs/applications/editors/vscode/extensions/ms-dotnettools-csharp/default.nix b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix similarity index 100% rename from pkgs/applications/editors/vscode/extensions/ms-dotnettools-csharp/default.nix rename to pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix diff --git a/pkgs/applications/editors/vscode/extensions/python/default.nix b/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix similarity index 100% rename from pkgs/applications/editors/vscode/extensions/python/default.nix rename to pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix diff --git a/pkgs/applications/editors/vscode/extensions/ms-toolsai-jupyter/default.nix b/pkgs/applications/editors/vscode/extensions/ms-toolsai.jupyter/default.nix similarity index 100% rename from pkgs/applications/editors/vscode/extensions/ms-toolsai-jupyter/default.nix rename to pkgs/applications/editors/vscode/extensions/ms-toolsai.jupyter/default.nix diff --git a/pkgs/applications/editors/vscode/extensions/remote-ssh/default.nix b/pkgs/applications/editors/vscode/extensions/ms-vscode-remote.remote-ssh/default.nix similarity index 100% rename from pkgs/applications/editors/vscode/extensions/remote-ssh/default.nix rename to pkgs/applications/editors/vscode/extensions/ms-vscode-remote.remote-ssh/default.nix diff --git a/pkgs/applications/editors/vscode/extensions/cpptools/default.nix b/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix similarity index 100% rename from pkgs/applications/editors/vscode/extensions/cpptools/default.nix rename to pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix diff --git a/pkgs/applications/editors/vscode/extensions/cpptools/missing_elf_deps.sh b/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/missing_elf_deps.sh similarity index 100% rename from pkgs/applications/editors/vscode/extensions/cpptools/missing_elf_deps.sh rename to pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/missing_elf_deps.sh diff --git a/pkgs/applications/editors/vscode/extensions/cpptools/package-activation-events.json b/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/package-activation-events.json similarity index 100% rename from pkgs/applications/editors/vscode/extensions/cpptools/package-activation-events.json rename to pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/package-activation-events.json diff --git a/pkgs/applications/editors/vscode/extensions/cpptools/update_helper.sh b/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/update_helper.sh similarity index 100% rename from pkgs/applications/editors/vscode/extensions/cpptools/update_helper.sh rename to pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/update_helper.sh diff --git a/pkgs/applications/editors/vscode/extensions/ms-vsliveshare-vsliveshare/default.nix b/pkgs/applications/editors/vscode/extensions/ms-vsliveshare.vsliveshare/default.nix similarity index 100% rename from pkgs/applications/editors/vscode/extensions/ms-vsliveshare-vsliveshare/default.nix rename to pkgs/applications/editors/vscode/extensions/ms-vsliveshare.vsliveshare/default.nix diff --git a/pkgs/applications/editors/vscode/extensions/rust-analyzer/build-deps/package.json b/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/build-deps/package.json similarity index 100% rename from pkgs/applications/editors/vscode/extensions/rust-analyzer/build-deps/package.json rename to pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/build-deps/package.json diff --git a/pkgs/applications/editors/vscode/extensions/rust-analyzer/default.nix b/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix similarity index 100% rename from pkgs/applications/editors/vscode/extensions/rust-analyzer/default.nix rename to pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix diff --git a/pkgs/applications/editors/vscode/extensions/rust-analyzer/update.sh b/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/update.sh similarity index 100% rename from pkgs/applications/editors/vscode/extensions/rust-analyzer/update.sh rename to pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/update.sh diff --git a/pkgs/applications/editors/vscode/extensions/lua/default.nix b/pkgs/applications/editors/vscode/extensions/sumneko.lua/default.nix similarity index 100% rename from pkgs/applications/editors/vscode/extensions/lua/default.nix rename to pkgs/applications/editors/vscode/extensions/sumneko.lua/default.nix diff --git a/pkgs/applications/editors/vscode/extensions/lua/remove-chmod.patch b/pkgs/applications/editors/vscode/extensions/sumneko.lua/remove-chmod.patch similarity index 100% rename from pkgs/applications/editors/vscode/extensions/lua/remove-chmod.patch rename to pkgs/applications/editors/vscode/extensions/sumneko.lua/remove-chmod.patch diff --git a/pkgs/applications/editors/vscode/extensions/vscode-lldb/build-deps/default.nix b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/build-deps/default.nix similarity index 100% rename from pkgs/applications/editors/vscode/extensions/vscode-lldb/build-deps/default.nix rename to pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/build-deps/default.nix diff --git a/pkgs/applications/editors/vscode/extensions/vscode-lldb/build-deps/node-env.nix b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/build-deps/node-env.nix similarity index 100% rename from pkgs/applications/editors/vscode/extensions/vscode-lldb/build-deps/node-env.nix rename to pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/build-deps/node-env.nix diff --git a/pkgs/applications/editors/vscode/extensions/vscode-lldb/build-deps/node-packages.nix b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/build-deps/node-packages.nix similarity index 100% rename from pkgs/applications/editors/vscode/extensions/vscode-lldb/build-deps/node-packages.nix rename to pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/build-deps/node-packages.nix diff --git a/pkgs/applications/editors/vscode/extensions/vscode-lldb/cmake-build-extension-only.patch b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/cmake-build-extension-only.patch similarity index 100% rename from pkgs/applications/editors/vscode/extensions/vscode-lldb/cmake-build-extension-only.patch rename to pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/cmake-build-extension-only.patch diff --git a/pkgs/applications/editors/vscode/extensions/vscode-lldb/default.nix b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix similarity index 100% rename from pkgs/applications/editors/vscode/extensions/vscode-lldb/default.nix rename to pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix diff --git a/pkgs/applications/editors/vscode/extensions/vscode-lldb/fix-python-installation.patch b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/fix-python-installation.patch similarity index 100% rename from pkgs/applications/editors/vscode/extensions/vscode-lldb/fix-python-installation.patch rename to pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/fix-python-installation.patch diff --git a/pkgs/applications/editors/vscode/extensions/vscode-lldb/lldb.nix b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/lldb.nix similarity index 100% rename from pkgs/applications/editors/vscode/extensions/vscode-lldb/lldb.nix rename to pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/lldb.nix diff --git a/pkgs/applications/editors/vscode/extensions/vscode-lldb/update.sh b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/update.sh similarity index 100% rename from pkgs/applications/editors/vscode/extensions/vscode-lldb/update.sh rename to pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/update.sh diff --git a/pkgs/applications/editors/vscode/extensions/vscode-utils.nix b/pkgs/applications/editors/vscode/extensions/vscode-utils.nix index eff075c49398..0eba230ad8e0 100644 --- a/pkgs/applications/editors/vscode/extensions/vscode-utils.nix +++ b/pkgs/applications/editors/vscode/extensions/vscode-utils.nix @@ -87,8 +87,8 @@ let builtins.map extensionFromVscodeMarketplace mktplcExtRefList; vscodeWithConfiguration = import ./vscodeWithConfiguration.nix { - inherit lib extensionsFromVscodeMarketplace writeShellScriptBin; - vscodeDefault = vscode; + inherit lib extensionsFromVscodeMarketplace writeShellScriptBin; + vscodeDefault = vscode; }; vscodeExts2nix = import ./vscodeExts2nix.nix {