Skip to content

Commit 2238593

Browse files
authored
chore: update pnpm to v9 (#13843)
* chore: update pnpm to v9 * pin golangci-lint and shfmt
1 parent a588ec5 commit 2238593

File tree

3 files changed

+57
-109
lines changed

3 files changed

+57
-109
lines changed

dogfood/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ RUN apt-get update && \
206206
google-chrome-stable microsoft-edge-beta && \
207207
# Pre-install system dependencies that Playwright needs. npx doesn't work here
208208
# for some reason. See https://github.com/microsoft/playwright-cli/issues/136
209-
npm i -g playwright@1.36.2 pnpm@^8 corepack && playwright install-deps && \
209+
npm i -g playwright@1.36.2 pnpm@^9 corepack && playwright install-deps && \
210210
npm cache clean --force
211211

212212
# Ensure PostgreSQL binaries are in the users $PATH.

flake.lock

Lines changed: 27 additions & 99 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 29 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,35 @@
33

44
inputs = {
55
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
6+
nixpkgs-pinned.url = "github:nixos/nixpkgs/5deee6281831847857720668867729617629ef1f";
67
flake-utils.url = "github:numtide/flake-utils";
7-
pnpm2nix.url = "github:nzbr/pnpm2nix-nzbr";
8-
drpc.url = "github:storj/drpc/v0.0.33";
8+
pnpm2nix = {
9+
url = "github:nzbr/pnpm2nix-nzbr";
10+
inputs.nixpkgs.follows = "nixpkgs";
11+
inputs.flake-utils.follows = "flake-utils";
12+
};
13+
drpc = {
14+
url = "github:storj/drpc/v0.0.34";
15+
inputs.nixpkgs.follows = "nixpkgs";
16+
inputs.flake-utils.follows = "flake-utils";
17+
};
918
};
1019

11-
outputs = { self, nixpkgs, flake-utils, drpc, pnpm2nix }:
20+
outputs = { self, nixpkgs, nixpkgs-pinned, flake-utils, drpc, pnpm2nix }:
1221
flake-utils.lib.eachDefaultSystem (system:
1322
let
14-
# Workaround for: terraform has an unfree license (‘bsl11’), refusing to evaluate.
15-
pkgs = import nixpkgs { inherit system; config.allowUnfree = true; };
23+
pkgs = import nixpkgs {
24+
inherit system;
25+
# Workaround for: terraform has an unfree license (‘bsl11’), refusing to evaluate.
26+
config.allowUnfree = true;
27+
};
28+
29+
# pinnedPkgs is used to pin packages that need to stay in sync with CI.
30+
# Everything else uses unstable.
31+
pinnedPkgs = import nixpkgs-pinned {
32+
inherit system;
33+
};
34+
1635
nodejs = pkgs.nodejs-18_x;
1736
# Check in https://search.nixos.org/packages to find new packages.
1837
# Use `nix --extra-experimental-features nix-command --extra-experimental-features flakes flake update`
@@ -41,7 +60,7 @@
4160
gnused
4261
go_1_22
4362
go-migrate
44-
golangci-lint
63+
(pinnedPkgs.golangci-lint)
4564
gopls
4665
gotestsum
4766
jq
@@ -52,7 +71,7 @@
5271
mockgen
5372
nfpm
5473
nodejs
55-
nodejs.pkgs.pnpm
74+
pnpm
5675
openssh
5776
openssl
5877
pango
@@ -63,9 +82,10 @@
6382
protobuf
6483
protoc-gen-go
6584
ripgrep
66-
sapling
85+
# This doesn't build on latest nixpkgs (July 10 2024)
86+
(pinnedPkgs.sapling)
6787
shellcheck
68-
shfmt
88+
(pinnedPkgs.shfmt)
6989
sqlc
7090
terraform
7191
typos

0 commit comments

Comments
 (0)