Merge pull request #29 from replit/za-merge

Merge stable into master

Author: Zabot

.semaphore/semaphore.yml

@@ -33,7 +33,7 @@ blocks:
         - name: Lint all files
           commands:
             - nix-linter default.nix overlay.nix shell.nix
-            - nix-linter -r pkgs
+            - find . -name "*.nix" -path "./pkgs/*" -not -path "./pkgs/node-packages/*" | xargs nix-linter
 
   - name: Build overlay packages
     task:

overlay.nix

@@ -3,16 +3,25 @@ self: super:
 with super.lib;
 
 let
+  nodePackages = self.callPackage ./pkgs/node-packages {
+    nodejs = super."nodejs-14_x";
+  };
+
   override = {
     # These packages will hide packages in the top level nixpkgs
   };
 in
 {
   replitPackages = rec {
     # Any other packages should go in the replitPackages namespace
-    jdt-language-server = self.callPackage ./pkgs/jdt-language-server { };
     replbox = self.callPackage ./pkgs/replbox { };
 
+    jdt-language-server = self.callPackage ./pkgs/jdt-language-server { };
+    rescript-language-server = self.callPackage ./pkgs/rescript-language-server { };
+
+    jest = nodePackages."jest-cli-23.6.0";
+    coffeescript = nodePackages."coffeescript-2.6.1";
+
     # The override packages are injected into the replitPackages namespace as
     # well so they can all be built together
   } // override;

pkgs/node-packages/default.nix

@@ -0,0 +1,20 @@
+# This file has been generated by node2nix 1.9.0. Do not edit!
+
+{ pkgs ? import <nixpkgs> {
+    inherit system;
+  }
+, system ? builtins.currentSystem
+, nodejs ? pkgs."nodejs-14_x"
+}:
+
+let
+  nodeEnv = import ./node-env.nix {
+    inherit (pkgs) stdenv lib python2 runCommand writeTextFile;
+    inherit pkgs nodejs;
+    libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
+  };
+in
+import ./node-packages.nix {
+  inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
+  inherit nodeEnv;
+}

pkgs/node-packages/generate.sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+nix-shell -p nodePackages.node2nix --run 'node2nix -14 --version'
+nix-shell -p nodePackages.node2nix --run 'node2nix -14 -i node-packages.json'
+nix-shell -p nixpkgs-fmt --run 'nixpkgs-fmt .'
+