Skip to content

chore: update pnpm to v9 #13843

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 10, 2024
Merged

chore: update pnpm to v9 #13843

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6911dc1
chore: update pnpm to v9
coadler Jul 9, 2024
0cd5788
pin golangci-lint and shfmt
coadler Jul 10, 2024
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
2 changes: 1 addition & 1 deletion dogfood/Dockerfile
View file
Open in desktop
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
126 changes: 27 additions & 99 deletions flake.lock
View file
Open in desktop

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

38 changes: 29 additions & 9 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,35 @@

inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs-pinned.url = "github:nixos/nixpkgs/5deee6281831847857720668867729617629ef1f";
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 }:
outputs = { self, nixpkgs, nixpkgs-pinned, flake-utils, drpc, pnpm2nix }:
flake-utils.lib.eachDefaultSystem (system:
let
# Workaround for: terraform has an unfree license (‘bsl11’), refusing to evaluate.
pkgs = import nixpkgs { inherit system; config.allowUnfree = true; };
pkgs = import nixpkgs {
inherit system;
# Workaround for: terraform has an unfree license (‘bsl11’), refusing to evaluate.
config.allowUnfree = true;
};

# pinnedPkgs is used to pin packages that need to stay in sync with CI.
# Everything else uses unstable.
pinnedPkgs = import nixpkgs-pinned {
inherit system;
};

nodejs = pkgs.nodejs-18_x;
# Check in https://search.nixos.org/packages to find new packages.
# Use `nix --extra-experimental-features nix-command --extra-experimental-features flakes flake update`
Expand Down Expand Up @@ -41,7 +60,7 @@
gnused
go_1_22
go-migrate
golangci-lint
(pinnedPkgs.golangci-lint)
gopls
gotestsum
jq
Expand All @@ -52,7 +71,7 @@
mockgen
nfpm
nodejs
nodejs.pkgs.pnpm
pnpm
openssh
openssl
pango
Expand All @@ -63,9 +82,10 @@
protobuf
protoc-gen-go
ripgrep
sapling
# This doesn't build on latest nixpkgs (July 10 2024)
(pinnedPkgs.sapling)
shellcheck
shfmt
(pinnedPkgs.shfmt)
sqlc
terraform
typos
Expand Down