Skip to content

Commit a985b17

Browse files
authored
fix(nix): make flake more robust, reduce log spam (#10661)
2 parents 8d0f9ee + 50fb3e7 commit a985b17

2 files changed

Lines changed: 14 additions & 12 deletions

File tree

flake.lock

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

flake.nix

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
description = "Trilium Notes (experimental flake)";
33

44
inputs = {
5-
nixpkgs.url = "github:NixOS/nixpkgs";
5+
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
66
flake-utils.url = "github:numtide/flake-utils";
77
pnpm2nix = {
8-
url = "github:TriliumNext/pnpm2nix-nzbr/main";
8+
url = "github:FliegendeWurst/pnpm2nix-nzbr/main";
99
inputs = {
1010
flake-utils.follows = "flake-utils";
1111
nixpkgs.follows = "nixpkgs";
@@ -303,14 +303,15 @@ nodejs.python
303303

304304
server = makeApp {
305305
app = "server";
306-
# pnpm throws an error at the end of `pnpm rebuild`, but it doesn't seem to matter:
306+
# Important note: if pnpm throws an error similar to the follow at the end of `pnpm rebuild`,
307+
# you should ensure the version of tsx (and other dependencies mentioned in the error) is identical project-wide.
307308
# ERR_PNPM_MISSING_HOISTED_LOCATIONS
308309
# vite@7.1.5(@types/node@24.3.0)(jiti@2.5.1)(less@4.1.3)(lightningcss@1.30.1)
309310
# (sass-embedded@1.91.0)(sass@1.91.0)(terser@5.43.1)(tsx@4.20.5)(yaml@2.8.1)
310311
# is not found in hoistedLocations inside node_modules/.modules.yaml
311312
preBuildCommands = ''
312313
pushd apps/server
313-
pnpm rebuild || true
314+
pnpm rebuild
314315
popd
315316
'';
316317
buildTask = "server:build";

0 commit comments

Comments
 (0)