elmPackages.elm-review: Init at 2.3.3

turboMaCk · Nov 29, 2020 · 200f413 · 200f413
1 parent db29c15
commit 200f413
Show file tree

Hide file tree

Showing 6 changed files with 1,330 additions and 305 deletions.
diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix
@@ -74,6 +74,12 @@ let
     inherit (hsPkgs.elmPkgs) elm;
   };
 
+  elmRustPackages = {
+    elm-json = import ./packages/elm-json.nix {
+      inherit rustPlatform fetchurl openssl stdenv pkg-config;
+    };
+  };
+
   elmNodePackages = with elmLib;
     let
       nodePkgs = import ./packages/node-composition.nix {
@@ -110,16 +116,16 @@ let
       create-elm-app = patchNpmElm (patchBinwrap [elmi-to-json]
         nodePkgs.create-elm-app);
 
+      elm-review = patchBinwrap [elmRustPackages.elm-json]
+        nodePkgs.elm-review;
+
       elm-language-server = nodePkgs."@elm-tooling/elm-language-server";
 
       elm-optimize-level-2 = nodePkgs."elm-optimize-level-2";
 
       inherit (nodePkgs) elm-doc-preview elm-live elm-upgrade elm-xref elm-analyse;
     };
 
-in hsPkgs.elmPkgs // elmNodePackages // {
-  elm-json = import ./packages/elm-json.nix {
-    inherit rustPlatform fetchurl openssl stdenv pkg-config;
-  };
+in hsPkgs.elmPkgs // elmNodePackages // elmRustPackages // {
   lib = elmLib;
 }
diff --git a/pkgs/development/compilers/elm/packages/generate-node-packages.sh b/pkgs/development/compilers/elm/packages/generate-node-packages.sh
@@ -10,4 +10,6 @@ $(nix-build $ROOT -A nodePackages.node2nix --no-out-link)/bin/node2nix \
     -i node-packages.json \
     -o node-packages.nix \
     -c node-composition.nix \
-    --no-copy-node-env -e ../../../node-packages/node-env.nix
+    # TODO: Switch to the commented out version once nodejs package set gets updated to new node2nix
+    -e node-env.nix
+    # --no-copy-node-env -e ../../../node-packages/node-env.nix
diff --git a/pkgs/development/compilers/elm/packages/node-composition.nix b/pkgs/development/compilers/elm/packages/node-composition.nix
@@ -5,8 +5,8 @@
   }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}:
 
 let
-  nodeEnv = import ../../../node-packages/node-env.nix {
-    inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
+  nodeEnv = import ./node-env.nix {
+    inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
     inherit nodejs;
     libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
   };