Skip to content

Commit 8e409e3

Browse files
authored
fix(flake.nix): update lockfile & add nix-prefetch-git (#16162)
Updated flake.lock and flake.nix dependencies, including: - Updated flake.lock - Updated vendorHash for coder binary - Ensured pnpm 9.x uses nodejs 20 - Reordered development shell packages alphabetically Change-Id: I3e5e9c9d1136ea8d03084bd13fdd723bff1680d9 Signed-off-by: Thomas Kosiewski <tk@coder.com>
1 parent 250f3c7 commit 8e409e3

File tree

3 files changed

+50
-46
lines changed

3 files changed

+50
-46
lines changed

flake.lock

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

flake.nix

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
nixpkgs-pinned.url = "github:nixos/nixpkgs/5deee6281831847857720668867729617629ef1f";
77
flake-utils.url = "github:numtide/flake-utils";
88
pnpm2nix = {
9-
url = "github:nzbr/pnpm2nix-nzbr";
9+
url = "github:ThomasK33/pnpm2nix-nzbr";
1010
inputs.nixpkgs.follows = "nixpkgs";
1111
inputs.flake-utils.follows = "flake-utils";
1212
};
@@ -33,6 +33,10 @@
3333
};
3434

3535
nodejs = pkgs.nodejs_20;
36+
pnpm = pkgs.pnpm_9.override {
37+
inherit nodejs; # Ensure it points to the above nodejs version
38+
};
39+
3640
# Check in https://search.nixos.org/packages to find new packages.
3741
# Use `nix --extra-experimental-features nix-command --extra-experimental-features flakes flake update`
3842
# to update the lock file if packages are out-of-date.
@@ -89,20 +93,20 @@
8993
less
9094
mockgen
9195
moreutils
92-
nix-prefetch-git
96+
neovim
9397
nfpm
98+
nix-prefetch-git
9499
nodejs
95-
neovim
96-
pnpm
97100
openssh
98101
openssl
99102
pango
100103
pixman
101104
pkg-config
102105
playwright-driver.browsers
106+
pnpm
103107
postgresql_16
104-
protobuf
105108
proto_gen_go_1_30
109+
protobuf
106110
ripgrep
107111
shellcheck
108112
(pinnedPkgs.shfmt)
@@ -121,7 +125,7 @@
121125

122126
# buildSite packages the site directory.
123127
buildSite = pnpm2nix.packages.${system}.mkPnpmPackage {
124-
inherit nodejs;
128+
inherit nodejs pnpm;
125129

126130
src = ./site/.;
127131
# Required for the `canvas` package!
@@ -145,7 +149,7 @@
145149
name = "coder-${osArch}";
146150
# Updated with ./scripts/update-flake.sh`.
147151
# This should be updated whenever go.mod changes!
148-
vendorHash = "sha256-ykLZqtALSvDpBc2yEjRGdOyCFNsnLZiGid0d4s27e8Q=";
152+
vendorHash = "sha256-DNQ3UPQoiiWEatMPj6B7QGGy9qOSvOmjADsrr+drCBY=";
149153
proxyVendor = true;
150154
src = ./.;
151155
nativeBuildInputs = with pkgs; [ getopt openssl zstd ];

site/pnpm-lock.yaml

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

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy