From 8f868e154ca265e38481ab15d28429f7ff72e0e4 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Wed, 16 Feb 2022 14:20:53 -0300 Subject: [PATCH] Move misc/vscode-extensions to applications/editors/vscode/extensions --- .../extensions}/_maintainers/update-bin-srcs-lib.sh | 0 .../editors/vscode/extensions}/cpptools/default.nix | 0 .../vscode/extensions}/cpptools/missing_elf_deps.sh | 0 .../extensions}/cpptools/package-activation-events.json | 0 .../editors/vscode/extensions}/cpptools/update_helper.sh | 0 .../editors/vscode/extensions}/default.nix | 0 .../editors/vscode/extensions}/language-packs.nix | 0 .../vscode/extensions}/mktplcExtRefToFetchArgs.nix | 0 .../vscode/extensions}/ms-dotnettools-csharp/default.nix | 0 .../ms-dotnettools-csharp/rt-deps-bin-srcs.json | 0 .../extensions}/ms-dotnettools-csharp/update-bin-srcs | 0 .../vscode/extensions}/ms-toolsai-jupyter/default.nix | 0 .../extensions}/ms-vsliveshare-vsliveshare/default.nix | 0 .../extensions}/ms-vsliveshare-vsliveshare/noop-syslog.c | 0 .../editors/vscode/extensions}/python/default.nix | 0 .../editors/vscode/extensions}/python/extract-nuget.nix | 0 .../editors/vscode/extensions}/remote-ssh/default.nix | 0 .../editors/vscode/extensions}/rescript/default.nix | 0 .../extensions}/rescript/rescript-editor-analysis.nix | 0 .../extensions}/rust-analyzer/build-deps/package.json | 0 .../editors/vscode/extensions}/rust-analyzer/default.nix | 2 +- .../editors/vscode/extensions}/terraform/default.nix | 0 .../vscode/extensions}/terraform/fix-terraform-ls.patch | 0 .../editors/vscode/extensions}/updateSettings.nix | 0 .../editors/vscode/extensions}/updateSettingsTest.nix | 0 .../editors/vscode/extensions}/update_installed_exts.sh | 2 +- .../extensions}/vscode-lldb/build-deps/package.json | 0 .../vscode-lldb/cmake-build-extension-only.patch | 0 .../editors/vscode/extensions}/vscode-lldb/default.nix | 2 +- .../editors/vscode/extensions}/vscode-lldb/lldb.nix | 0 .../extensions}/vscode-lldb/reset-cargo-config.patch | 0 .../editors/vscode/extensions}/vscode-lldb/update.sh | 0 .../editors/vscode/extensions}/vscode-utils.nix | 0 .../editors/vscode/extensions}/vscodeEnv.nix | 0 .../editors/vscode/extensions}/vscodeEnvTest.nix | 0 .../editors/vscode/extensions}/vscodeExts2nix.nix | 0 .../vscode/extensions}/vscodeWithConfiguration.nix | 0 .../editors/vscode/extensions}/wakatime/default.nix | 0 pkgs/development/node-packages/node-packages.json | 4 ++-- pkgs/development/node-packages/node-packages.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 6 +++--- 41 files changed, 12 insertions(+), 12 deletions(-) rename pkgs/{misc/vscode-extensions => applications/editors/vscode/extensions}/_maintainers/update-bin-srcs-lib.sh (100%) rename pkgs/{misc/vscode-extensions => applications/editors/vscode/extensions}/cpptools/default.nix (100%) rename pkgs/{misc/vscode-extensions => applications/editors/vscode/extensions}/cpptools/missing_elf_deps.sh (100%) rename pkgs/{misc/vscode-extensions => applications/editors/vscode/extensions}/cpptools/package-activation-events.json (100%) rename pkgs/{misc/vscode-extensions => applications/editors/vscode/extensions}/cpptools/update_helper.sh (100%) rename pkgs/{misc/vscode-extensions => applications/editors/vscode/extensions}/default.nix (100%) rename pkgs/{misc/vscode-extensions => applications/editors/vscode/extensions}/language-packs.nix (100%) rename pkgs/{misc/vscode-extensions => applications/editors/vscode/extensions}/mktplcExtRefToFetchArgs.nix (100%) rename pkgs/{misc/vscode-extensions => applications/editors/vscode/extensions}/ms-dotnettools-csharp/default.nix (100%) rename pkgs/{misc/vscode-extensions => applications/editors/vscode/extensions}/ms-dotnettools-csharp/rt-deps-bin-srcs.json (100%) rename pkgs/{misc/vscode-extensions => applications/editors/vscode/extensions}/ms-dotnettools-csharp/update-bin-srcs (100%) rename pkgs/{misc/vscode-extensions => applications/editors/vscode/extensions}/ms-toolsai-jupyter/default.nix (100%) rename pkgs/{misc/vscode-extensions => applications/editors/vscode/extensions}/ms-vsliveshare-vsliveshare/default.nix (100%) rename pkgs/{misc/vscode-extensions => applications/editors/vscode/extensions}/ms-vsliveshare-vsliveshare/noop-syslog.c (100%) rename pkgs/{misc/vscode-extensions => applications/editors/vscode/extensions}/python/default.nix (100%) rename pkgs/{misc/vscode-extensions => applications/editors/vscode/extensions}/python/extract-nuget.nix (100%) rename pkgs/{misc/vscode-extensions => applications/editors/vscode/extensions}/remote-ssh/default.nix (100%) rename pkgs/{misc/vscode-extensions => applications/editors/vscode/extensions}/rescript/default.nix (100%) rename pkgs/{misc/vscode-extensions => applications/editors/vscode/extensions}/rescript/rescript-editor-analysis.nix (100%) rename pkgs/{misc/vscode-extensions => applications/editors/vscode/extensions}/rust-analyzer/build-deps/package.json (100%) rename pkgs/{misc/vscode-extensions => applications/editors/vscode/extensions}/rust-analyzer/default.nix (95%) rename pkgs/{misc/vscode-extensions => applications/editors/vscode/extensions}/terraform/default.nix (100%) rename pkgs/{misc/vscode-extensions => applications/editors/vscode/extensions}/terraform/fix-terraform-ls.patch (100%) rename pkgs/{misc/vscode-extensions => applications/editors/vscode/extensions}/updateSettings.nix (100%) rename pkgs/{misc/vscode-extensions => applications/editors/vscode/extensions}/updateSettingsTest.nix (100%) rename pkgs/{misc/vscode-extensions => applications/editors/vscode/extensions}/update_installed_exts.sh (96%) rename pkgs/{misc/vscode-extensions => applications/editors/vscode/extensions}/vscode-lldb/build-deps/package.json (100%) rename pkgs/{misc/vscode-extensions => applications/editors/vscode/extensions}/vscode-lldb/cmake-build-extension-only.patch (100%) rename pkgs/{misc/vscode-extensions => applications/editors/vscode/extensions}/vscode-lldb/default.nix (95%) rename pkgs/{misc/vscode-extensions => applications/editors/vscode/extensions}/vscode-lldb/lldb.nix (100%) rename pkgs/{misc/vscode-extensions => applications/editors/vscode/extensions}/vscode-lldb/reset-cargo-config.patch (100%) rename pkgs/{misc/vscode-extensions => applications/editors/vscode/extensions}/vscode-lldb/update.sh (100%) rename pkgs/{misc/vscode-extensions => applications/editors/vscode/extensions}/vscode-utils.nix (100%) rename pkgs/{misc/vscode-extensions => applications/editors/vscode/extensions}/vscodeEnv.nix (100%) rename pkgs/{misc/vscode-extensions => applications/editors/vscode/extensions}/vscodeEnvTest.nix (100%) rename pkgs/{misc/vscode-extensions => applications/editors/vscode/extensions}/vscodeExts2nix.nix (100%) rename pkgs/{misc/vscode-extensions => applications/editors/vscode/extensions}/vscodeWithConfiguration.nix (100%) rename pkgs/{misc/vscode-extensions => applications/editors/vscode/extensions}/wakatime/default.nix (100%) diff --git a/pkgs/misc/vscode-extensions/_maintainers/update-bin-srcs-lib.sh b/pkgs/applications/editors/vscode/extensions/_maintainers/update-bin-srcs-lib.sh similarity index 100% rename from pkgs/misc/vscode-extensions/_maintainers/update-bin-srcs-lib.sh rename to pkgs/applications/editors/vscode/extensions/_maintainers/update-bin-srcs-lib.sh diff --git a/pkgs/misc/vscode-extensions/cpptools/default.nix b/pkgs/applications/editors/vscode/extensions/cpptools/default.nix similarity index 100% rename from pkgs/misc/vscode-extensions/cpptools/default.nix rename to pkgs/applications/editors/vscode/extensions/cpptools/default.nix diff --git a/pkgs/misc/vscode-extensions/cpptools/missing_elf_deps.sh b/pkgs/applications/editors/vscode/extensions/cpptools/missing_elf_deps.sh similarity index 100% rename from pkgs/misc/vscode-extensions/cpptools/missing_elf_deps.sh rename to pkgs/applications/editors/vscode/extensions/cpptools/missing_elf_deps.sh diff --git a/pkgs/misc/vscode-extensions/cpptools/package-activation-events.json b/pkgs/applications/editors/vscode/extensions/cpptools/package-activation-events.json similarity index 100% rename from pkgs/misc/vscode-extensions/cpptools/package-activation-events.json rename to pkgs/applications/editors/vscode/extensions/cpptools/package-activation-events.json diff --git a/pkgs/misc/vscode-extensions/cpptools/update_helper.sh b/pkgs/applications/editors/vscode/extensions/cpptools/update_helper.sh similarity index 100% rename from pkgs/misc/vscode-extensions/cpptools/update_helper.sh rename to pkgs/applications/editors/vscode/extensions/cpptools/update_helper.sh diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix similarity index 100% rename from pkgs/misc/vscode-extensions/default.nix rename to pkgs/applications/editors/vscode/extensions/default.nix diff --git a/pkgs/misc/vscode-extensions/language-packs.nix b/pkgs/applications/editors/vscode/extensions/language-packs.nix similarity index 100% rename from pkgs/misc/vscode-extensions/language-packs.nix rename to pkgs/applications/editors/vscode/extensions/language-packs.nix diff --git a/pkgs/misc/vscode-extensions/mktplcExtRefToFetchArgs.nix b/pkgs/applications/editors/vscode/extensions/mktplcExtRefToFetchArgs.nix similarity index 100% rename from pkgs/misc/vscode-extensions/mktplcExtRefToFetchArgs.nix rename to pkgs/applications/editors/vscode/extensions/mktplcExtRefToFetchArgs.nix diff --git a/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/default.nix b/pkgs/applications/editors/vscode/extensions/ms-dotnettools-csharp/default.nix similarity index 100% rename from pkgs/misc/vscode-extensions/ms-dotnettools-csharp/default.nix rename to pkgs/applications/editors/vscode/extensions/ms-dotnettools-csharp/default.nix diff --git a/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/rt-deps-bin-srcs.json b/pkgs/applications/editors/vscode/extensions/ms-dotnettools-csharp/rt-deps-bin-srcs.json similarity index 100% rename from pkgs/misc/vscode-extensions/ms-dotnettools-csharp/rt-deps-bin-srcs.json rename to pkgs/applications/editors/vscode/extensions/ms-dotnettools-csharp/rt-deps-bin-srcs.json diff --git a/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/update-bin-srcs b/pkgs/applications/editors/vscode/extensions/ms-dotnettools-csharp/update-bin-srcs similarity index 100% rename from pkgs/misc/vscode-extensions/ms-dotnettools-csharp/update-bin-srcs rename to pkgs/applications/editors/vscode/extensions/ms-dotnettools-csharp/update-bin-srcs diff --git a/pkgs/misc/vscode-extensions/ms-toolsai-jupyter/default.nix b/pkgs/applications/editors/vscode/extensions/ms-toolsai-jupyter/default.nix similarity index 100% rename from pkgs/misc/vscode-extensions/ms-toolsai-jupyter/default.nix rename to pkgs/applications/editors/vscode/extensions/ms-toolsai-jupyter/default.nix diff --git a/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix b/pkgs/applications/editors/vscode/extensions/ms-vsliveshare-vsliveshare/default.nix similarity index 100% rename from pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix rename to pkgs/applications/editors/vscode/extensions/ms-vsliveshare-vsliveshare/default.nix diff --git a/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/noop-syslog.c b/pkgs/applications/editors/vscode/extensions/ms-vsliveshare-vsliveshare/noop-syslog.c similarity index 100% rename from pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/noop-syslog.c rename to pkgs/applications/editors/vscode/extensions/ms-vsliveshare-vsliveshare/noop-syslog.c diff --git a/pkgs/misc/vscode-extensions/python/default.nix b/pkgs/applications/editors/vscode/extensions/python/default.nix similarity index 100% rename from pkgs/misc/vscode-extensions/python/default.nix rename to pkgs/applications/editors/vscode/extensions/python/default.nix diff --git a/pkgs/misc/vscode-extensions/python/extract-nuget.nix b/pkgs/applications/editors/vscode/extensions/python/extract-nuget.nix similarity index 100% rename from pkgs/misc/vscode-extensions/python/extract-nuget.nix rename to pkgs/applications/editors/vscode/extensions/python/extract-nuget.nix diff --git a/pkgs/misc/vscode-extensions/remote-ssh/default.nix b/pkgs/applications/editors/vscode/extensions/remote-ssh/default.nix similarity index 100% rename from pkgs/misc/vscode-extensions/remote-ssh/default.nix rename to pkgs/applications/editors/vscode/extensions/remote-ssh/default.nix diff --git a/pkgs/misc/vscode-extensions/rescript/default.nix b/pkgs/applications/editors/vscode/extensions/rescript/default.nix similarity index 100% rename from pkgs/misc/vscode-extensions/rescript/default.nix rename to pkgs/applications/editors/vscode/extensions/rescript/default.nix diff --git a/pkgs/misc/vscode-extensions/rescript/rescript-editor-analysis.nix b/pkgs/applications/editors/vscode/extensions/rescript/rescript-editor-analysis.nix similarity index 100% rename from pkgs/misc/vscode-extensions/rescript/rescript-editor-analysis.nix rename to pkgs/applications/editors/vscode/extensions/rescript/rescript-editor-analysis.nix diff --git a/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json b/pkgs/applications/editors/vscode/extensions/rust-analyzer/build-deps/package.json similarity index 100% rename from pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json rename to pkgs/applications/editors/vscode/extensions/rust-analyzer/build-deps/package.json diff --git a/pkgs/misc/vscode-extensions/rust-analyzer/default.nix b/pkgs/applications/editors/vscode/extensions/rust-analyzer/default.nix similarity index 95% rename from pkgs/misc/vscode-extensions/rust-analyzer/default.nix rename to pkgs/applications/editors/vscode/extensions/rust-analyzer/default.nix index fa08acb84c60..271607af6bd4 100644 --- a/pkgs/misc/vscode-extensions/rust-analyzer/default.nix +++ b/pkgs/applications/editors/vscode/extensions/rust-analyzer/default.nix @@ -29,7 +29,7 @@ let sha256 = "sha256-vh7z8jupVxXPOko3sWUsOB7eji/7lKfwJ/CE3iw97Sw="; }; - build-deps = nodePackages."rust-analyzer-build-deps-../../misc/vscode-extensions/rust-analyzer/build-deps"; + build-deps = nodePackages."rust-analyzer-build-deps-../../applications/editors/vscode/extensions/rust-analyzer/build-deps"; # FIXME: Making a new derivation to link `node_modules` and run `npm run package` # will cause a build failure. vsix = build-deps.override { diff --git a/pkgs/misc/vscode-extensions/terraform/default.nix b/pkgs/applications/editors/vscode/extensions/terraform/default.nix similarity index 100% rename from pkgs/misc/vscode-extensions/terraform/default.nix rename to pkgs/applications/editors/vscode/extensions/terraform/default.nix diff --git a/pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch b/pkgs/applications/editors/vscode/extensions/terraform/fix-terraform-ls.patch similarity index 100% rename from pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch rename to pkgs/applications/editors/vscode/extensions/terraform/fix-terraform-ls.patch diff --git a/pkgs/misc/vscode-extensions/updateSettings.nix b/pkgs/applications/editors/vscode/extensions/updateSettings.nix similarity index 100% rename from pkgs/misc/vscode-extensions/updateSettings.nix rename to pkgs/applications/editors/vscode/extensions/updateSettings.nix diff --git a/pkgs/misc/vscode-extensions/updateSettingsTest.nix b/pkgs/applications/editors/vscode/extensions/updateSettingsTest.nix similarity index 100% rename from pkgs/misc/vscode-extensions/updateSettingsTest.nix rename to pkgs/applications/editors/vscode/extensions/updateSettingsTest.nix diff --git a/pkgs/misc/vscode-extensions/update_installed_exts.sh b/pkgs/applications/editors/vscode/extensions/update_installed_exts.sh similarity index 96% rename from pkgs/misc/vscode-extensions/update_installed_exts.sh rename to pkgs/applications/editors/vscode/extensions/update_installed_exts.sh index 44cf506b3ab8..6fff7454493a 100755 --- a/pkgs/misc/vscode-extensions/update_installed_exts.sh +++ b/pkgs/applications/editors/vscode/extensions/update_installed_exts.sh @@ -4,7 +4,7 @@ set -eu -o pipefail # can be added to your configuration with the following command and snippet: -# $ ./pkgs/misc/vscode-extensions/update_installed_exts.sh > extensions.nix +# $ ./pkgs/applications/editors/vscode/extensions/update_installed_exts.sh > extensions.nix # # packages = with pkgs; # (vscode-with-extensions.override { diff --git a/pkgs/misc/vscode-extensions/vscode-lldb/build-deps/package.json b/pkgs/applications/editors/vscode/extensions/vscode-lldb/build-deps/package.json similarity index 100% rename from pkgs/misc/vscode-extensions/vscode-lldb/build-deps/package.json rename to pkgs/applications/editors/vscode/extensions/vscode-lldb/build-deps/package.json diff --git a/pkgs/misc/vscode-extensions/vscode-lldb/cmake-build-extension-only.patch b/pkgs/applications/editors/vscode/extensions/vscode-lldb/cmake-build-extension-only.patch similarity index 100% rename from pkgs/misc/vscode-extensions/vscode-lldb/cmake-build-extension-only.patch rename to pkgs/applications/editors/vscode/extensions/vscode-lldb/cmake-build-extension-only.patch diff --git a/pkgs/misc/vscode-extensions/vscode-lldb/default.nix b/pkgs/applications/editors/vscode/extensions/vscode-lldb/default.nix similarity index 95% rename from pkgs/misc/vscode-extensions/vscode-lldb/default.nix rename to pkgs/applications/editors/vscode/extensions/vscode-lldb/default.nix index 7f20d0e71912..c9d4deebdfd8 100644 --- a/pkgs/misc/vscode-extensions/vscode-lldb/default.nix +++ b/pkgs/applications/editors/vscode/extensions/vscode-lldb/default.nix @@ -42,7 +42,7 @@ let doCheck = false; }; - nodeDeps = nodePackages."vscode-lldb-build-deps-../../misc/vscode-extensions/vscode-lldb/build-deps"; + nodeDeps = nodePackages."vscode-lldb-build-deps-../../applications/editors/vscode/extensions/vscode-lldb/build-deps"; in stdenv.mkDerivation { pname = "vscode-extension-${publisher}-${pname}"; diff --git a/pkgs/misc/vscode-extensions/vscode-lldb/lldb.nix b/pkgs/applications/editors/vscode/extensions/vscode-lldb/lldb.nix similarity index 100% rename from pkgs/misc/vscode-extensions/vscode-lldb/lldb.nix rename to pkgs/applications/editors/vscode/extensions/vscode-lldb/lldb.nix diff --git a/pkgs/misc/vscode-extensions/vscode-lldb/reset-cargo-config.patch b/pkgs/applications/editors/vscode/extensions/vscode-lldb/reset-cargo-config.patch similarity index 100% rename from pkgs/misc/vscode-extensions/vscode-lldb/reset-cargo-config.patch rename to pkgs/applications/editors/vscode/extensions/vscode-lldb/reset-cargo-config.patch diff --git a/pkgs/misc/vscode-extensions/vscode-lldb/update.sh b/pkgs/applications/editors/vscode/extensions/vscode-lldb/update.sh similarity index 100% rename from pkgs/misc/vscode-extensions/vscode-lldb/update.sh rename to pkgs/applications/editors/vscode/extensions/vscode-lldb/update.sh diff --git a/pkgs/misc/vscode-extensions/vscode-utils.nix b/pkgs/applications/editors/vscode/extensions/vscode-utils.nix similarity index 100% rename from pkgs/misc/vscode-extensions/vscode-utils.nix rename to pkgs/applications/editors/vscode/extensions/vscode-utils.nix diff --git a/pkgs/misc/vscode-extensions/vscodeEnv.nix b/pkgs/applications/editors/vscode/extensions/vscodeEnv.nix similarity index 100% rename from pkgs/misc/vscode-extensions/vscodeEnv.nix rename to pkgs/applications/editors/vscode/extensions/vscodeEnv.nix diff --git a/pkgs/misc/vscode-extensions/vscodeEnvTest.nix b/pkgs/applications/editors/vscode/extensions/vscodeEnvTest.nix similarity index 100% rename from pkgs/misc/vscode-extensions/vscodeEnvTest.nix rename to pkgs/applications/editors/vscode/extensions/vscodeEnvTest.nix diff --git a/pkgs/misc/vscode-extensions/vscodeExts2nix.nix b/pkgs/applications/editors/vscode/extensions/vscodeExts2nix.nix similarity index 100% rename from pkgs/misc/vscode-extensions/vscodeExts2nix.nix rename to pkgs/applications/editors/vscode/extensions/vscodeExts2nix.nix diff --git a/pkgs/misc/vscode-extensions/vscodeWithConfiguration.nix b/pkgs/applications/editors/vscode/extensions/vscodeWithConfiguration.nix similarity index 100% rename from pkgs/misc/vscode-extensions/vscodeWithConfiguration.nix rename to pkgs/applications/editors/vscode/extensions/vscodeWithConfiguration.nix diff --git a/pkgs/misc/vscode-extensions/wakatime/default.nix b/pkgs/applications/editors/vscode/extensions/wakatime/default.nix similarity index 100% rename from pkgs/misc/vscode-extensions/wakatime/default.nix rename to pkgs/applications/editors/vscode/extensions/wakatime/default.nix diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index cf0e9fc18324..8e2fe29c4259 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -257,7 +257,7 @@ , "reveal-md" , "rimraf" , "rollup" -, { "rust-analyzer-build-deps": "../../misc/vscode-extensions/rust-analyzer/build-deps" } +, { "rust-analyzer-build-deps": "../../applications/editors/vscode/extensions/rust-analyzer/build-deps" } , "rtlcss" , "s3http" , "sass" @@ -361,7 +361,7 @@ , "vscode-json-languageserver" , "vscode-json-languageserver-bin" , "vscode-langservers-extracted" -, { "vscode-lldb-build-deps": "../../misc/vscode-extensions/vscode-lldb/build-deps" } +, { "vscode-lldb-build-deps": "../../applications/editors/vscode/extensions/vscode-lldb/build-deps" } , "vue-cli" , "vue-language-server" , "wavedrom-cli" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 8dcdbfeecfdc..2217914b8565 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -119480,11 +119480,11 @@ in bypassCache = true; reconstructLock = true; }; - "rust-analyzer-build-deps-../../misc/vscode-extensions/rust-analyzer/build-deps" = nodeEnv.buildNodePackage { + "rust-analyzer-build-deps-../../applications/editors/vscode/extensions/rust-analyzer/build-deps" = nodeEnv.buildNodePackage { name = "rust-analyzer"; packageName = "rust-analyzer"; version = "0.2.834"; - src = ../../misc/vscode-extensions/rust-analyzer/build-deps; + src = ../../applications/editors/vscode/extensions/rust-analyzer/build-deps; dependencies = [ sources."@babel/code-frame-7.12.11" sources."@babel/helper-validator-identifier-7.16.7" @@ -130759,11 +130759,11 @@ in bypassCache = true; reconstructLock = true; }; - "vscode-lldb-build-deps-../../misc/vscode-extensions/vscode-lldb/build-deps" = nodeEnv.buildNodePackage { + "vscode-lldb-build-deps-../../applications/editors/vscode/extensions/vscode-lldb/build-deps" = nodeEnv.buildNodePackage { name = "vscode-lldb"; packageName = "vscode-lldb"; version = "1.6.8"; - src = ../../misc/vscode-extensions/vscode-lldb/build-deps; + src = ../../applications/editors/vscode/extensions/vscode-lldb/build-deps; dependencies = [ sources."@discoveryjs/json-ext-0.5.6" sources."@types/eslint-8.4.1" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index be3a38a94ebd..3549325c2589 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29561,11 +29561,11 @@ with pkgs; vscode-fhs = vscode.fhs; vscode-fhsWithPackages = vscode.fhsWithPackages; - vscode-with-extensions = callPackage ../applications/editors/vscode/with-extensions.nix {}; + vscode-with-extensions = callPackage ../applications/editors/vscode/with-extensions.nix { }; - vscode-utils = callPackage ../misc/vscode-extensions/vscode-utils.nix {}; + vscode-utils = callPackage ../applications/editors/vscode/extensions/vscode-utils.nix { }; - vscode-extensions = recurseIntoAttrs (callPackage ../misc/vscode-extensions {}); + vscode-extensions = recurseIntoAttrs (callPackage ../applications/editors/vscode/extensions { }); vscodium = callPackage ../applications/editors/vscode/vscodium.nix { }; vscodium-fhs = vscodium.fhs;