Merge pull request #987 from candy-lang/support-nix

Fix Nix setup
candy-lang · Mar 14, 2024 · 60f66ed · 60f66ed
2 parents ed3bf74 + 171d1c2
commit 60f66ed
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -94,6 +94,7 @@ There are still compiler bugs and performance improvements that need work before
 ## How to use Candy
 
 1. Install [<img height="16" src="https://rust-lang.org/static/images/favicon.svg"> Rust](https://rust-lang.org): [rust-lang.org/tools/install](https://rust-lang.org/tools/install) (use Rustup since we use nightly features).
+   - Alternatively, use the provided [<img height="16" src="https://nixos.org/_astro/flake-blue.Bf2X2kC4_Z1yqDoT.svg"> Nix](https://nixos.org/) flake to install all required dependencies.
 2. Clone this repo.
 
 Then, you can use Candy in two ways:

diff --git a/flake.nix b/flake.nix
@@ -37,6 +37,8 @@
               llvmPackages_15.clangUseLLVM
               llvmPackages_15.llvm
               mold
+              nodejs_18
+              nodePackages.typescript
               rustToolchain
               rust-analyzer
               sccache

diff --git a/vscode_extension/package-lock.json b/vscode_extension/package-lock.json
diff --git a/vscode_extension/package.json b/vscode_extension/package.json
@@ -10,7 +10,9 @@
     "directory": "new-new-packages/vscode_extension"
   },
   "//": "Keep in sync with `devDependencies.@types/vscode`",
+  "//": "https://github.com/ewanharris/vscode-versions",
   "engines": {
+    "node": "^18.17.1",
     "vscode": "^1.86.0"
   },
   "categories": [