diff options
author | Anderson Torres <torres.anderson.85@protonmail.com> | 2022-02-24 14:50:40 -0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-02-24 14:50:40 -0300 |
commit | f15188d1b8bf2e1f97c8ec9a4f4315a7ab8239fd (patch) | |
tree | f4c342fb518c8025fe14e4580ed305301e55ccb8 | |
parent | 5aebf5097b34f8ff2c3de64a7a3d85a9c2d1e6a1 (diff) | |
parent | 38862374212fcd136bb2572cf3df11e90b5757ed (diff) | |
download | nixpkgs-f15188d1b8bf2e1f97c8ec9a4f4315a7ab8239fd.tar nixpkgs-f15188d1b8bf2e1f97c8ec9a4f4315a7ab8239fd.tar.gz nixpkgs-f15188d1b8bf2e1f97c8ec9a4f4315a7ab8239fd.tar.bz2 nixpkgs-f15188d1b8bf2e1f97c8ec9a4f4315a7ab8239fd.tar.lz nixpkgs-f15188d1b8bf2e1f97c8ec9a4f4315a7ab8239fd.tar.xz nixpkgs-f15188d1b8bf2e1f97c8ec9a4f4315a7ab8239fd.tar.zst nixpkgs-f15188d1b8bf2e1f97c8ec9a4f4315a7ab8239fd.zip |
Merge pull request #160344 from AndersonTorres/move-vscode-plugins
Move misc/vscode-extensions to applications/editors/vscode/extensions
-rw-r--r-- | .github/CODEOWNERS | 2 | ||||
-rwxr-xr-x | pkgs/applications/editors/vscode/extensions/_maintainers/update-bin-srcs-lib.sh (renamed from pkgs/misc/vscode-extensions/_maintainers/update-bin-srcs-lib.sh) | 0 | ||||
-rw-r--r-- | pkgs/applications/editors/vscode/extensions/cpptools/default.nix (renamed from pkgs/misc/vscode-extensions/cpptools/default.nix) | 0 | ||||
-rwxr-xr-x | pkgs/applications/editors/vscode/extensions/cpptools/missing_elf_deps.sh (renamed from pkgs/misc/vscode-extensions/cpptools/missing_elf_deps.sh) | 0 | ||||
-rw-r--r-- | pkgs/applications/editors/vscode/extensions/cpptools/package-activation-events.json (renamed from pkgs/misc/vscode-extensions/cpptools/package-activation-events.json) | 0 | ||||
-rwxr-xr-x | pkgs/applications/editors/vscode/extensions/cpptools/update_helper.sh (renamed from pkgs/misc/vscode-extensions/cpptools/update_helper.sh) | 0 | ||||
-rw-r--r-- | pkgs/applications/editors/vscode/extensions/default.nix (renamed from pkgs/misc/vscode-extensions/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/editors/vscode/extensions/language-packs.nix (renamed from pkgs/misc/vscode-extensions/language-packs.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/editors/vscode/extensions/mktplcExtRefToFetchArgs.nix (renamed from pkgs/misc/vscode-extensions/mktplcExtRefToFetchArgs.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/editors/vscode/extensions/ms-dotnettools-csharp/default.nix (renamed from pkgs/misc/vscode-extensions/ms-dotnettools-csharp/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/editors/vscode/extensions/ms-dotnettools-csharp/rt-deps-bin-srcs.json (renamed from pkgs/misc/vscode-extensions/ms-dotnettools-csharp/rt-deps-bin-srcs.json) | 0 | ||||
-rwxr-xr-x | pkgs/applications/editors/vscode/extensions/ms-dotnettools-csharp/update-bin-srcs (renamed from pkgs/misc/vscode-extensions/ms-dotnettools-csharp/update-bin-srcs) | 0 | ||||
-rw-r--r-- | pkgs/applications/editors/vscode/extensions/ms-toolsai-jupyter/default.nix (renamed from pkgs/misc/vscode-extensions/ms-toolsai-jupyter/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/editors/vscode/extensions/ms-vsliveshare-vsliveshare/default.nix (renamed from pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/editors/vscode/extensions/ms-vsliveshare-vsliveshare/noop-syslog.c (renamed from pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/noop-syslog.c) | 0 | ||||
-rw-r--r-- | pkgs/applications/editors/vscode/extensions/python/default.nix (renamed from pkgs/misc/vscode-extensions/python/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/editors/vscode/extensions/python/extract-nuget.nix (renamed from pkgs/misc/vscode-extensions/python/extract-nuget.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/editors/vscode/extensions/remote-ssh/default.nix (renamed from pkgs/misc/vscode-extensions/remote-ssh/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/editors/vscode/extensions/rescript/default.nix (renamed from pkgs/misc/vscode-extensions/rescript/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/editors/vscode/extensions/rescript/rescript-editor-analysis.nix (renamed from pkgs/misc/vscode-extensions/rescript/rescript-editor-analysis.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/editors/vscode/extensions/rust-analyzer/build-deps/package.json (renamed from pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json) | 0 | ||||
-rw-r--r-- | pkgs/applications/editors/vscode/extensions/rust-analyzer/default.nix (renamed from pkgs/misc/vscode-extensions/rust-analyzer/default.nix) | 2 | ||||
-rw-r--r-- | pkgs/applications/editors/vscode/extensions/terraform/default.nix (renamed from pkgs/misc/vscode-extensions/terraform/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/editors/vscode/extensions/terraform/fix-terraform-ls.patch (renamed from pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch) | 0 | ||||
-rw-r--r-- | pkgs/applications/editors/vscode/extensions/updateSettings.nix (renamed from pkgs/misc/vscode-extensions/updateSettings.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/editors/vscode/extensions/updateSettingsTest.nix (renamed from pkgs/misc/vscode-extensions/updateSettingsTest.nix) | 0 | ||||
-rwxr-xr-x | pkgs/applications/editors/vscode/extensions/update_installed_exts.sh (renamed from pkgs/misc/vscode-extensions/update_installed_exts.sh) | 2 | ||||
-rw-r--r-- | pkgs/applications/editors/vscode/extensions/vscode-lldb/build-deps/package.json (renamed from pkgs/misc/vscode-extensions/vscode-lldb/build-deps/package.json) | 0 | ||||
-rw-r--r-- | pkgs/applications/editors/vscode/extensions/vscode-lldb/cmake-build-extension-only.patch (renamed from pkgs/misc/vscode-extensions/vscode-lldb/cmake-build-extension-only.patch) | 0 | ||||
-rw-r--r-- | pkgs/applications/editors/vscode/extensions/vscode-lldb/default.nix (renamed from pkgs/misc/vscode-extensions/vscode-lldb/default.nix) | 2 | ||||
-rw-r--r-- | pkgs/applications/editors/vscode/extensions/vscode-lldb/lldb.nix (renamed from pkgs/misc/vscode-extensions/vscode-lldb/lldb.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/editors/vscode/extensions/vscode-lldb/reset-cargo-config.patch (renamed from pkgs/misc/vscode-extensions/vscode-lldb/reset-cargo-config.patch) | 0 | ||||
-rwxr-xr-x | pkgs/applications/editors/vscode/extensions/vscode-lldb/update.sh (renamed from pkgs/misc/vscode-extensions/vscode-lldb/update.sh) | 8 | ||||
-rw-r--r-- | pkgs/applications/editors/vscode/extensions/vscode-utils.nix (renamed from pkgs/misc/vscode-extensions/vscode-utils.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/editors/vscode/extensions/vscodeEnv.nix (renamed from pkgs/misc/vscode-extensions/vscodeEnv.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/editors/vscode/extensions/vscodeEnvTest.nix (renamed from pkgs/misc/vscode-extensions/vscodeEnvTest.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/editors/vscode/extensions/vscodeExts2nix.nix (renamed from pkgs/misc/vscode-extensions/vscodeExts2nix.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/editors/vscode/extensions/vscodeWithConfiguration.nix (renamed from pkgs/misc/vscode-extensions/vscodeWithConfiguration.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/editors/vscode/extensions/wakatime/default.nix (renamed from pkgs/misc/vscode-extensions/wakatime/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/applications/editors/vscode/update-shell.nix | 18 | ||||
-rwxr-xr-x | pkgs/applications/editors/vscode/update-vscode.sh | 4 | ||||
-rwxr-xr-x | pkgs/applications/editors/vscode/update-vscodium.sh | 4 | ||||
-rw-r--r-- | pkgs/development/node-packages/node-packages.json | 4 | ||||
-rw-r--r-- | pkgs/development/node-packages/node-packages.nix | 8 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
45 files changed, 40 insertions, 20 deletions
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 79296f64737..26b4e54659f 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -229,7 +229,7 @@ /pkgs/misc/vim-plugins @jonringer @softinio # VsCode Extensions -/pkgs/misc/vscode-extensions @jonringer +/pkgs/applications/editors/vscode/extensions @jonringer # Prometheus exporter modules and tests /nixos/modules/services/monitoring/prometheus/exporters.nix @WilliButz 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 index e3d1e5fb139..e3d1e5fb139 100755 --- a/pkgs/misc/vscode-extensions/_maintainers/update-bin-srcs-lib.sh +++ b/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 index 077c3807eca..077c3807eca 100644 --- a/pkgs/misc/vscode-extensions/cpptools/default.nix +++ b/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 index f5eb08d78a5..f5eb08d78a5 100755 --- a/pkgs/misc/vscode-extensions/cpptools/missing_elf_deps.sh +++ b/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 index c2d8a10f340..c2d8a10f340 100644 --- a/pkgs/misc/vscode-extensions/cpptools/package-activation-events.json +++ b/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 index 00ef7755324..00ef7755324 100755 --- a/pkgs/misc/vscode-extensions/cpptools/update_helper.sh +++ b/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 index 3e5bf42dd95..3e5bf42dd95 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/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 index f97727d6c2c..f97727d6c2c 100644 --- a/pkgs/misc/vscode-extensions/language-packs.nix +++ b/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 index a781250fc18..a781250fc18 100644 --- a/pkgs/misc/vscode-extensions/mktplcExtRefToFetchArgs.nix +++ b/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 index d91cbccb808..d91cbccb808 100644 --- a/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/default.nix +++ b/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 index 13678d1097e..13678d1097e 100644 --- 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 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 index 8c43231b1a7..8c43231b1a7 100755 --- a/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/update-bin-srcs +++ b/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 index 6be5e225fa3..6be5e225fa3 100644 --- a/pkgs/misc/vscode-extensions/ms-toolsai-jupyter/default.nix +++ b/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 index d4200c33552..d4200c33552 100644 --- a/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix +++ b/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 index c76ec57a382..c76ec57a382 100644 --- a/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/noop-syslog.c +++ b/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 index 09c5c02aee9..09c5c02aee9 100644 --- a/pkgs/misc/vscode-extensions/python/default.nix +++ b/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 index 1e70cabe035..1e70cabe035 100644 --- a/pkgs/misc/vscode-extensions/python/extract-nuget.nix +++ b/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 index 3bfc94bb6ea..3bfc94bb6ea 100644 --- a/pkgs/misc/vscode-extensions/remote-ssh/default.nix +++ b/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 index 5bad9b2e628..5bad9b2e628 100644 --- a/pkgs/misc/vscode-extensions/rescript/default.nix +++ b/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 index 518280b4b06..518280b4b06 100644 --- a/pkgs/misc/vscode-extensions/rescript/rescript-editor-analysis.nix +++ b/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 index 54a931eee86..54a931eee86 100644 --- a/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json +++ b/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 index fa08acb84c6..271607af6bd 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 index e6e094bb1cb..e6e094bb1cb 100644 --- a/pkgs/misc/vscode-extensions/terraform/default.nix +++ b/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 index e2dcd0b70aa..e2dcd0b70aa 100644 --- a/pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch +++ b/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 index 443b4093027..443b4093027 100644 --- a/pkgs/misc/vscode-extensions/updateSettings.nix +++ b/pkgs/applications/editors/vscode/extensions/updateSettings.nix diff --git a/pkgs/misc/vscode-extensions/updateSettingsTest.nix b/pkgs/applications/editors/vscode/extensions/updateSettingsTest.nix index 097b9cad166..097b9cad166 100644 --- a/pkgs/misc/vscode-extensions/updateSettingsTest.nix +++ b/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 index 44cf506b3ab..6fff7454493 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 index 2e5670d3039..2e5670d3039 100644 --- a/pkgs/misc/vscode-extensions/vscode-lldb/build-deps/package.json +++ b/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 index fb55816b942..fb55816b942 100644 --- 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 diff --git a/pkgs/misc/vscode-extensions/vscode-lldb/default.nix b/pkgs/applications/editors/vscode/extensions/vscode-lldb/default.nix index 7f20d0e7191..c9d4deebdfd 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 index e04e9ad0b5b..e04e9ad0b5b 100644 --- a/pkgs/misc/vscode-extensions/vscode-lldb/lldb.nix +++ b/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 index e95df0a9cef..e95df0a9cef 100644 --- a/pkgs/misc/vscode-extensions/vscode-lldb/reset-cargo-config.patch +++ b/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 index 2fe0cc5cf29..0dc38c6fdb7 100755 --- a/pkgs/misc/vscode-extensions/vscode-lldb/update.sh +++ b/pkgs/applications/editors/vscode/extensions/vscode-lldb/update.sh @@ -1,5 +1,6 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p jq nix-prefetch +#! /usr/bin/env nix-shell +#! nix-shell ../../update-shell.nix -i bash + set -eo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" if [[ $# -ne 1 ]]; then @@ -12,7 +13,8 @@ FIXME: This script doesn't update patched lldb. Please manually check branches of https://github.com/vadimcn/llvm-project and update lldb with correct version of LLVM. " -nixpkgs=../../../.. +# Ideally, nixpkgs points to default.nix file of Nixpkgs official tree +nixpkgs=../../../../../.. nixFile=./default.nix owner=vadimcn repo=vscode-lldb diff --git a/pkgs/misc/vscode-extensions/vscode-utils.nix b/pkgs/applications/editors/vscode/extensions/vscode-utils.nix index 49b730361af..49b730361af 100644 --- a/pkgs/misc/vscode-extensions/vscode-utils.nix +++ b/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 index 7c58a4bdfb3..7c58a4bdfb3 100644 --- a/pkgs/misc/vscode-extensions/vscodeEnv.nix +++ b/pkgs/applications/editors/vscode/extensions/vscodeEnv.nix diff --git a/pkgs/misc/vscode-extensions/vscodeEnvTest.nix b/pkgs/applications/editors/vscode/extensions/vscodeEnvTest.nix index 19a9edbf1af..19a9edbf1af 100644 --- a/pkgs/misc/vscode-extensions/vscodeEnvTest.nix +++ b/pkgs/applications/editors/vscode/extensions/vscodeEnvTest.nix diff --git a/pkgs/misc/vscode-extensions/vscodeExts2nix.nix b/pkgs/applications/editors/vscode/extensions/vscodeExts2nix.nix index 58cbe663c90..58cbe663c90 100644 --- a/pkgs/misc/vscode-extensions/vscodeExts2nix.nix +++ b/pkgs/applications/editors/vscode/extensions/vscodeExts2nix.nix diff --git a/pkgs/misc/vscode-extensions/vscodeWithConfiguration.nix b/pkgs/applications/editors/vscode/extensions/vscodeWithConfiguration.nix index 39479d7c2f2..39479d7c2f2 100644 --- a/pkgs/misc/vscode-extensions/vscodeWithConfiguration.nix +++ b/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 index 9832b16f747..9832b16f747 100644 --- a/pkgs/misc/vscode-extensions/wakatime/default.nix +++ b/pkgs/applications/editors/vscode/extensions/wakatime/default.nix diff --git a/pkgs/applications/editors/vscode/update-shell.nix b/pkgs/applications/editors/vscode/update-shell.nix new file mode 100644 index 00000000000..aa9488c217f --- /dev/null +++ b/pkgs/applications/editors/vscode/update-shell.nix @@ -0,0 +1,18 @@ +{ pkgs ? import ../../../.. { } }: + +# Ideally, pkgs points to default.nix file of Nixpkgs official tree +with pkgs; + +mkShell { + packages = [ + bash + curl + gawk + gnugrep + gnused + jq + nix + nix-prefetch + nix-prefetch-scripts + ]; +} diff --git a/pkgs/applications/editors/vscode/update-vscode.sh b/pkgs/applications/editors/vscode/update-vscode.sh index 709fbe1c751..67ec7a21b34 100755 --- a/pkgs/applications/editors/vscode/update-vscode.sh +++ b/pkgs/applications/editors/vscode/update-vscode.sh @@ -1,5 +1,5 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl jq gnused +#! /usr/bin/env nix-shell +#! nix-shell update-shell.nix -i bash # Update script for the vscode versions and hashes. # Usually doesn't need to be called by hand, diff --git a/pkgs/applications/editors/vscode/update-vscodium.sh b/pkgs/applications/editors/vscode/update-vscodium.sh index 79c6b497ecc..377068c0821 100755 --- a/pkgs/applications/editors/vscode/update-vscodium.sh +++ b/pkgs/applications/editors/vscode/update-vscodium.sh @@ -1,5 +1,5 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl gnugrep gnused gawk +#! /usr/bin/env nix-shell +#! nix-shell update-shell.nix -i bash # Update script for the vscode versions and hashes. # Usually doesn't need to be called by hand, diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index dba80f28422..9fa420975af 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 17004d2de71..3adfd4becd3 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -118020,11 +118020,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" @@ -129307,11 +129307,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 28ed00b8144..1656f633918 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29612,11 +29612,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; |