Modify NIX and keyserver configuration files to allow node version >= 18

Summary: This differential applies temporary solution to allow usage of node version >= 18 since it is necessary for current project regarding blob service and big notifications. The solution is not perfect and the correct one will be implemented in future: https://linear.app/comm/issue/ENG-4373/revert-to-using-nvm-to-lock-into-specific-node-version Test Plan: 1. run `yarn cleaninstall` 2. run `nix develop` 3. run `node --version` and expect the output to match 18.12.1 Reviewers: ashoat, jon, O1 Nix Reviewed By: ashoat, jon, O1 Nix Subscribers: tomek Differential Revision: https://phab.comm.dev/D8520
CommE2E · Aug 10, 2023 · 649a14c · 649a14c
1 parent 9f9aae9
commit 649a14c
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 9 deletions.
diff --git a/keyserver/.nvmrc b/keyserver/.nvmrc
@@ -1 +1 @@
-16.18.0
+18.12.1
diff --git a/keyserver/Dockerfile b/keyserver/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:16.18.0-bullseye
+FROM node:18.12.1-bullseye
 
 #-------------------------------------------------------------------------------
 # STEP 0: SET UP USER

diff --git a/nix/dev-shell.nix b/nix/dev-shell.nix
@@ -27,7 +27,7 @@
 , localstack
 , mariadb
 , mariadb-up
-, nodejs-16_x-openssl_1_1
+, nodejs
 , olm
 , openjdk11
 , openssl
@@ -65,7 +65,7 @@ mkShell {
 
     # node development
     mariadb
-    nodejs-16_x-openssl_1_1
+    nodejs
     yarn
     python3
     redis

diff --git a/nix/overlay.nix b/nix/overlay.nix
@@ -82,9 +82,4 @@ prev:
   });
 
   rabbitmq-up = prev.callPackage ./rabbitmq-up-mac.nix { };
-
-  # Ensure that yarn is using the pinned version
-  yarn = prev.yarn.override (_: {
-    nodejs = final.nodejs-16_x-openssl_1_1;
-  });
 }