Merge pull request #280 from expipiplus1/joe-nix-fix

vscode dependency -> @types/vscode

Author: lukel97

default.nix

@@ -1,15 +1,17 @@
 { pkgs ? import <nixpkgs> {} }:
 with pkgs;
-pkgs.mkYarnPackage {
-  name = "vscode-haskell";
+
+# Please run `yarn import` first to generate yarn.lock!
+pkgs.mkYarnPackage rec {
+  name = "haskell";
   src = ./.;
   packageJSON = ./package.json;
   yarnLock = ./yarn.lock;
 
   installPhase = ''
     mkdir -p "$out/dist"
     yarn vscode:prepublish --output-path "$out/dist"
-    mv deps/vscode-haskell/{package.json,hie-vscode.sh,hie-vscode.bat} "$out"
+    mv deps/${name}/package.json "$out"
   '';
 
   distPhase = ''

package-lock.json

@@ -171,7 +171,6 @@
     "vscode:prepublish": "webpack --mode production",
     "compile": "webpack --mode none",
     "watch": "webpack --mode none --watch --info-verbosity verbose",
-    "postinstall": "node ./node_modules/vscode/bin/install",
     "tslint": "tslint -p tsconfig.json -c tslint.json --format stylish 'src/**/*.ts'",
     "tslint-fix": "tslint --fix -p tsconfig.json  -c tslint.json --format stylish 'src/**/*.ts'",
     "push-tag": "git tag -a $npm_package_version -m \"Version $npm_package_version\" && git push origin $npm_package_version"
@@ -188,6 +187,7 @@
     "@types/lru-cache": "^4.1.2",
     "@types/node": "^14.0.3",
     "@types/request-promise-native": "^1.0.17",
+    "@types/vscode": "^1.48.0",
     "@types/yauzl": "^2.9.1",
     "husky": "^4.2.5",
     "prettier": "^2.0.5",
@@ -196,7 +196,6 @@
     "tslint": "^5.20.1",
     "tslint-loader": "^3.5.4",
     "typescript": "^3.9.5",
-    "vscode": "^1.1.36",
     "webpack": "^4.42.1",
     "webpack-cli": "^3.3.11"
   },