nix: fix and update flake (#4224)

- Update the Nix flake to get new things (especially newer Node.js and pnpm, current pnpm version was older than what driver-adapters required)
- Switch from Node.js 18 to Node.js 20 to match .nvmrc
- Fix the flake after updating to latest nixpkgs due to changes in cargo-auditable. The problem was that we were overriding cargo and rustc packages using our own overlay on top of rust-overlay, but the packages from rust-overlay do not accept the same arguments as those in nixpkgs. That's probably the reason why rust-overlay doesn't do that and defines new packages instead. The `rustToolchain` package we were defining was fine but I moved it to module arguments instead and got rid of the overlay completely.
- Add a way to opt-out of nix for gitpod

.envrc

@@ -36,7 +36,9 @@ fi
 
 # Set up env vars and build inputs from flake.nix automatically for nix users.
 # If you don't use nix, you can safely ignore this.
-if command -v nix &> /dev/null
+# You can set the DISABLE_NIX environment variable if you're in an environment
+# where nix is pre-installed (e.g. gitpod) but you don't want to use it.
+if command -v nix &> /dev/null && [ -z ${DISABLE_NIX+x} ]
 then
     if nix flake metadata > /dev/null; then
         if type nix_direnv_watch_file &> /dev/null; then

nix/all-engines.nix

@@ -1,4 +1,4 @@
-{ pkgs, flakeInputs, lib, self', ... }:
+{ pkgs, flakeInputs, lib, self', rustToolchain, ... }:
 
 let
   stdenv = pkgs.clangStdenv;
@@ -15,7 +15,7 @@ let
     src = srcPath;
     name = "prisma-engines-source";
   };
-  craneLib = flakeInputs.crane.mkLib pkgs;
+  craneLib = (flakeInputs.crane.mkLib pkgs).overrideToolchain rustToolchain.default;
   deps = craneLib.vendorCargoDeps { inherit src; };
   libSuffix = stdenv.hostPlatform.extensions.sharedLibrary;
 in
@@ -34,6 +34,7 @@ in
     ] ++ lib.optionals stdenv.isDarwin [
       perl # required to build openssl
       darwin.apple_sdk.frameworks.Security
+      iconv
     ];
 
     configurePhase = ''
@@ -53,13 +54,15 @@ in
       cp target/release/prisma-fmt $out/bin/
       cp target/release/libquery_engine${libSuffix} $out/lib/libquery_engine.node
     '';
+
+    dontStrip = true;
   };
 
   packages.test-cli = lib.makeOverridable
     ({ profile }: stdenv.mkDerivation {
       name = "test-cli";
       inherit src;
-      inherit (self'.packages.prisma-engines) buildInputs nativeBuildInputs configurePhase;
+      inherit (self'.packages.prisma-engines) buildInputs nativeBuildInputs configurePhase dontStrip;
 
       buildPhase = "cargo build --profile=${profile} --bin=test-cli";
 
@@ -76,7 +79,7 @@ in
     ({ profile }: stdenv.mkDerivation {
       name = "query-engine-bin";
       inherit src;
-      inherit (self'.packages.prisma-engines) buildInputs nativeBuildInputs configurePhase;
+      inherit (self'.packages.prisma-engines) buildInputs nativeBuildInputs configurePhase dontStrip;
 
       buildPhase = "cargo build --profile=${profile} --bin=query-engine";
 
@@ -96,7 +99,7 @@ in
     ({ profile }: stdenv.mkDerivation {
       name = "query-engine-bin-and-lib";
       inherit src;
-      inherit (self'.packages.prisma-engines) buildInputs nativeBuildInputs configurePhase;
+      inherit (self'.packages.prisma-engines) buildInputs nativeBuildInputs configurePhase dontStrip;
 
       buildPhase = ''
         cargo build --profile=${profile} --bin=query-engine

nix/args.nix

@@ -4,10 +4,10 @@
     let
       overlays = [
         flakeInputs.rust-overlay.overlays.default
-        (self: super:
-          let toolchain = super.rust-bin.stable.latest; in
-          { cargo = toolchain.minimal; rustc = toolchain.minimal; rustToolchain = toolchain; })
       ];
-    in
-    { pkgs = import flakeInputs.nixpkgs { inherit system overlays; }; };
+    in rec
+    {
+      pkgs = import flakeInputs.nixpkgs { inherit system overlays; };
+      rustToolchain = pkgs.rust-bin.stable.latest;
+    };
 }

nix/shell.nix

@@ -1,17 +1,18 @@
-{ self', pkgs, ... }:
+{ self', pkgs, rustToolchain, ... }:
 
 let
-  devToolchain = pkgs.rustToolchain.default.override { extensions = [ "rust-analyzer" "rust-src" ]; };
+  devToolchain = rustToolchain.default.override { extensions = [ "rust-analyzer" "rust-src" ]; };
+  nodejs = pkgs.nodejs_latest;
 in
 {
   devShells.default = pkgs.mkShell {
     packages = [
       devToolchain
       pkgs.llvmPackages_latest.bintools
 
-      pkgs.nodejs
-      pkgs.nodePackages.typescript-language-server
-      pkgs.nodePackages.pnpm
+      nodejs
+      nodejs.pkgs.typescript-language-server
+      nodejs.pkgs.pnpm
     ];
     inputsFrom = [ self'.packages.prisma-engines ];
     shellHook = pkgs.lib.optionalString pkgs.stdenv.isLinux

prisma-schema-wasm/Cargo.toml

@@ -7,6 +7,6 @@ edition = "2021"
 crate-type = ["cdylib"]
 
 [dependencies]
-wasm-bindgen = "=0.2.84"
+wasm-bindgen = "=0.2.87"
 wasm-logger = { version = "0.2.0", optional = true }
 prisma-fmt = { path = "../prisma-fmt" }