Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
chore: update pnpm to v9
  • Loading branch information
coadler committed Jul 9, 2024
commit 6911dc17aa431a5bb29c8677e03464ed2f1a8eef
2 changes: 1 addition & 1 deletion dogfood/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
131 changes: 21 additions & 110 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 13 additions & 4 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 }:
Expand Down Expand Up @@ -52,7 +60,7 @@
mockgen
nfpm
nodejs
nodejs.pkgs.pnpm
pnpm
openssh
openssl
pango
Expand All @@ -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
Expand Down