From 6911dc17aa431a5bb29c8677e03464ed2f1a8eef Mon Sep 17 00:00:00 2001 From: Colin Adler Date: Tue, 9 Jul 2024 00:58:12 -0500 Subject: [PATCH 1/2] chore: update pnpm to v9 --- dogfood/Dockerfile | 2 +- flake.lock | 131 ++++++++------------------------------------- flake.nix | 17 ++++-- 3 files changed, 35 insertions(+), 115 deletions(-) diff --git a/dogfood/Dockerfile b/dogfood/Dockerfile index 8c12534315007..997a4999df2df 100644 --- 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 index 2d9e9b4cf4cd5..d1f622df1a6da 100644 --- a/flake.lock +++ b/flake.lock @@ -2,20 +2,24 @@ "nodes": { "drpc": { "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" + "flake-utils": [ + "flake-utils" + ], + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { - "lastModified": 1682005581, - "narHash": "sha256-mPaQg6bN1I6160RG4Yi3CjKNJ0oHoGYYxOSpOWHWXK0=", + "lastModified": 1710270657, + "narHash": "sha256-hjb+8iB0HTdAYtsOvr6gY2yhwdg2NLUqQRVJi4qMmJI=", "owner": "storj", "repo": "drpc", - "rev": "9716137f6037cde2f813985fcee00409b4101ed2", + "rev": "a5d487af8ae33deb7913b0f7c06b2c7ec7cd4dcc", "type": "github" }, "original": { "owner": "storj", - "ref": "v0.0.33", + "ref": "v0.0.34", "repo": "drpc", "type": "github" } @@ -24,24 +28,6 @@ "inputs": { "systems": "systems" }, - "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { - "inputs": { - "systems": "systems_2" - }, "locked": { "lastModified": 1710146030, "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", @@ -56,62 +42,13 @@ "type": "github" } }, - "flake-utils_3": { - "inputs": { - "systems": "systems_3" - }, - "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "nixpkgs": { "locked": { - "lastModified": 1681823821, - "narHash": "sha256-LGm3j7hW2C3T28q2/r49tX01zIyoaaQAJRi7rlISbr0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "9b419c67cfeb210d333fc0c34ae6e8c7a987d443", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1719075281, - "narHash": "sha256-CyyxvOwFf12I91PBWz43iGT1kjsf5oi6ax7CrvaMyAo=", + "lastModified": 1720418205, + "narHash": "sha256-cPJoFPXU44GlhWg4pUk9oUPqurPlCFZ11ZQPk21GTPU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a71e967ef3694799d0c418c98332f7ff4cc5f6af", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1702151865, - "narHash": "sha256-9VAt19t6yQa7pHZLDbil/QctAgVsA66DLnzdRGqDisg=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "666fc80e7b2afb570462423cb0e1cf1a3a34fedd", + "rev": "655a58a72a6601292512670343087c2d75d859c1", "type": "github" }, "original": { @@ -123,8 +60,12 @@ }, "pnpm2nix": { "inputs": { - "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_3" + "flake-utils": [ + "flake-utils" + ], + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1706694632, @@ -143,8 +84,8 @@ "root": { "inputs": { "drpc": "drpc", - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_2", + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs", "pnpm2nix": "pnpm2nix" } }, @@ -162,36 +103,6 @@ "repo": "default", "type": "github" } - }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 6e1aa4a5ffe51..ca7df9adbaaf5 100644 --- 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 From 0cd5788953de4910a9ae56975546374536f5aef8 Mon Sep 17 00:00:00 2001 From: Colin Adler Date: Wed, 10 Jul 2024 13:01:52 -0500 Subject: [PATCH 2/2] pin golangci-lint and shfmt --- flake.lock | 17 +++++++++++++++++ flake.nix | 25 ++++++++++++++++++------- 2 files changed, 35 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index d1f622df1a6da..265d0cae5f3df 100644 --- a/flake.lock +++ b/flake.lock @@ -58,6 +58,22 @@ "type": "github" } }, + "nixpkgs-pinned": { + "locked": { + "lastModified": 1699526406, + "narHash": "sha256-gN+SUmD0WPi3zqYv4QwDFkWH7QQJosJSuhv1DZ6wU84=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "5deee6281831847857720668867729617629ef1f", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "rev": "5deee6281831847857720668867729617629ef1f", + "type": "github" + } + }, "pnpm2nix": { "inputs": { "flake-utils": [ @@ -86,6 +102,7 @@ "drpc": "drpc", "flake-utils": "flake-utils", "nixpkgs": "nixpkgs", + "nixpkgs-pinned": "nixpkgs-pinned", "pnpm2nix": "pnpm2nix" } }, diff --git a/flake.nix b/flake.nix index ca7df9adbaaf5..07ab3ee091150 100644 --- a/flake.nix +++ b/flake.nix @@ -3,6 +3,7 @@ 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"; @@ -16,11 +17,21 @@ }; }; - 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` @@ -49,7 +60,7 @@ gnused go_1_22 go-migrate - golangci-lint + (pinnedPkgs.golangci-lint) gopls gotestsum jq @@ -71,10 +82,10 @@ protobuf protoc-gen-go ripgrep - # This doesn't build on latest nixpkgs for me for some reason - # sapling + # This doesn't build on latest nixpkgs (July 10 2024) + (pinnedPkgs.sapling) shellcheck - shfmt + (pinnedPkgs.shfmt) sqlc terraform typos