Merge pull request #205486 from aaronjheng/mongosh

pkgs/development/tools/mongosh/composition.nix

@@ -5,7 +5,7 @@
   }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-16_x"}:
 
 let
-  nodeEnv = import ../../../node-packages/node-env.nix {
+  nodeEnv = import ../../node-packages/node-env.nix {
     inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
     inherit pkgs nodejs;
     libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;

pkgs/development/tools/mongosh/default.nix

@@ -1,7 +1,7 @@
 { pkgs, stdenv, lib, testers, mongosh }:
 
 let
-  nodePackages = import ./gen/composition.nix {
+  nodePackages = import ./composition.nix {
     inherit pkgs;
     inherit (stdenv.hostPlatform) system;
   };

pkgs/development/tools/mongosh/generate.sh

@@ -1,21 +1,13 @@
 #!/usr/bin/env nix-shell
 #! nix-shell -i bash -p node2nix
 
-MONGOSH_ROOT="$(
-    cd "$(dirname "$0")"
-    pwd
-)"
-pushd $MONGOSH_ROOT 1>/dev/null
-
-rm -rf gen && mkdir -p gen
+cd "$(dirname "$0")"
 
 node2nix \
     --no-copy-node-env \
     --node-env ../../node-packages/node-env.nix \
     --input packages.json \
-    --output gen/packages.nix \
-    --composition gen/composition.nix \
+    --output packages.nix \
+    --composition composition.nix \
     --strip-optional-dependencies \
     --nodejs-16
-
-popd 1>/dev/null