NotificationsYou must be signed in to change notification settings
Fork917
Star10.1k

Commit8e409e3

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 alphabeticallyChange-Id: I3e5e9c9d1136ea8d03084bd13fdd723bff1680d9Signed-off-by: Thomas Kosiewski <tk@coder.com>

1 parent250f3c7 commit8e409e3Copy full SHA for 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 aboutcustomizing how changed files appear on GitHub.

`‎flake.nix`

Lines changed: 11 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`nixpkgs-pinned.url="github:nixos/nixpkgs/5deee6281831847857720668867729617629ef1f";`
`7`	`7`	`flake-utils.url="github:numtide/flake-utils";`
`8`	`8`	`pnpm2nix={`
`9`		`-url="github:nzbr/pnpm2nix-nzbr";`
	`9`	`+url="github:ThomasK33/pnpm2nix-nzbr";`
`10`	`10`	`inputs.nixpkgs.follows="nixpkgs";`
`11`	`11`	`inputs.flake-utils.follows="flake-utils";`
`12`	`12`	`};`
`@@ -33,6 +33,10 @@`
`33`	`33`	`};`
`34`	`34`
`35`	`35`	`nodejs=pkgs.nodejs_20;`
	`36`	`+pnpm=pkgs.pnpm_9.override{`
	`37`	`+inheritnodejs;# Ensure it points to the above nodejs version`
	`38`	`+};`
	`39`	`+`
`36`	`40`	`# Check in https://search.nixos.org/packages to find new packages.`
`37`	`41`	# Use `nix --extra-experimental-features nix-command --extra-experimental-features flakes flake update`
`38`	`42`	`# to update the lock file if packages are out-of-date.`
`@@ -89,20 +93,20 @@`
`89`	`93`	`less`
`90`	`94`	`mockgen`
`91`	`95`	`moreutils`
`92`		`-nix-prefetch-git`
	`96`	`+neovim`
`93`	`97`	`nfpm`
	`98`	`+nix-prefetch-git`
`94`	`99`	`nodejs`
`95`		`-neovim`
`96`		`-pnpm`
`97`	`100`	`openssh`
`98`	`101`	`openssl`
`99`	`102`	`pango`
`100`	`103`	`pixman`
`101`	`104`	`pkg-config`
`102`	`105`	`playwright-driver.browsers`
	`106`	`+pnpm`
`103`	`107`	`postgresql_16`
`104`		`-protobuf`
`105`	`108`	`proto_gen_go_1_30`
	`109`	`+protobuf`
`106`	`110`	`ripgrep`
`107`	`111`	`shellcheck`
`108`	`112`	`(pinnedPkgs.shfmt)`
`@@ -121,7 +125,7 @@`
`121`	`125`
`122`	`126`	`# buildSite packages the site directory.`
`123`	`127`	`buildSite=pnpm2nix.packages.${system}.mkPnpmPackage{`
`124`		`-inheritnodejs;`
	`128`	`+inheritnodejspnpm;`
`125`	`129`
`126`	`130`	`src=./site/.;`
`127`	`131`	# Required for the `canvas` package!
`@@ -145,7 +149,7 @@`
`145`	`149`	`name="coder-${osArch}";`
`146`	`150`	# Updated with ./scripts/update-flake.sh`.
`147`	`151`	`# This should be updated whenever go.mod changes!`
`148`		`-vendorHash="sha256-ykLZqtALSvDpBc2yEjRGdOyCFNsnLZiGid0d4s27e8Q=";`
	`152`	`+vendorHash="sha256-DNQ3UPQoiiWEatMPj6B7QGGy9qOSvOmjADsrr+drCBY=";`
`149`	`153`	`proxyVendor=true;`
`150`	`154`	`src=./.;`
`151`	`155`	`nativeBuildInputs=withpkgs;[getoptopensslzstd];`

`‎site/pnpm-lock.yaml`

Lines changed: 28 additions & 28 deletions

Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit8e409e3

File tree

3 files changed

3 files changed

`‎flake.lock`

`‎flake.nix`

`‎site/pnpm-lock.yaml`

0 commit comments