chore: update pnpm to v9

coadler · coadler · commit 6911dc17aa43 · 2024-07-09T01:05:48.000-05:00
diff --git a/dogfood/Dockerfile b/dogfood/Dockerfile
@@ -206,7 +206,7 @@ RUN apt-get update && \
 	google-chrome-stable microsoft-edge-beta && \
 	# Pre-install system dependencies that Playwright needs. npx doesn't work here
 	# for some reason. See https://github.com/microsoft/playwright-cli/issues/136
-	npm i -g playwright@1.36.2 pnpm@^8 corepack && playwright install-deps && \
+	npm i -g playwright@1.36.2 pnpm@^9 corepack && playwright install-deps && \
 	npm cache clean --force
 
 # Ensure PostgreSQL binaries are in the users $PATH.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -4,8 +4,16 @@
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     flake-utils.url = "github:numtide/flake-utils";
-    pnpm2nix.url = "github:nzbr/pnpm2nix-nzbr";
-    drpc.url = "github:storj/drpc/v0.0.33";
+    pnpm2nix = {
+      url = "github:nzbr/pnpm2nix-nzbr";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.flake-utils.follows = "flake-utils";
+    };
+    drpc = {
+      url = "github:storj/drpc/v0.0.34";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.flake-utils.follows = "flake-utils";
+    };
   };
 
   outputs = { self, nixpkgs, flake-utils, drpc, pnpm2nix }:
@@ -52,7 +60,7 @@
           mockgen
           nfpm
           nodejs
-          nodejs.pkgs.pnpm
+          pnpm
           openssh
           openssl
           pango
@@ -63,7 +71,8 @@
           protobuf
           protoc-gen-go
           ripgrep
-          sapling
+          # This doesn't build on latest nixpkgs for me for some reason
+          # sapling
           shellcheck
           shfmt
           sqlc
