Merge pull request #160344 from AndersonTorres/move-vscode-plugins

Move misc/vscode-extensions to applications/editors/vscode/extensions

.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

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 {

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 {

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}";

pkgs/applications/editors/vscode/extensions/vscode-lldb/update.sh

@@ -1,5 +1,6 @@
-#!/usr/bin/env nix-shell
+#! /usr/bin/env nix-shell
-#!nix-shell -i bash -p jq nix-prefetch
+#! 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

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
+  ];
+}

pkgs/applications/editors/vscode/update-vscode.sh

@@ -1,5 +1,5 @@
-#!/usr/bin/env nix-shell
+#! /usr/bin/env nix-shell
-#!nix-shell -i bash -p curl jq gnused
+#! nix-shell update-shell.nix -i bash
 
 # Update script for the vscode versions and hashes.
 # Usually doesn't need to be called by hand,

pkgs/applications/editors/vscode/update-vscodium.sh

@@ -1,5 +1,5 @@
-#!/usr/bin/env nix-shell
+#! /usr/bin/env nix-shell
-#!nix-shell -i bash -p curl gnugrep gnused gawk
+#! nix-shell update-shell.nix -i bash
 
 # Update script for the vscode versions and hashes.
 # Usually doesn't need to be called by hand,

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"

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"

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;