Merge remote-tracking branch 'origin/main' into merge/main-into-dev
# Conflicts: # nix/package.nix # packages/app/src/screens/settings-screen.tsx # packages/server/src/server/session.workspace-git-watch.test.ts # packages/server/src/server/session.workspaces.test.ts
This commit is contained in:
+1
-1
@@ -42,7 +42,7 @@ buildNpmPackage rec {
|
||||
|
||||
# To update: run `nix build` with lib.fakeHash, copy the `got:` hash.
|
||||
# CI auto-updates this when package-lock.json changes (see .github/workflows/).
|
||||
npmDepsHash = "sha256-7ZBAwyC3CGqA9bK7bDW8YvlQyYhw1bsfSRd/LrdfA/E=";
|
||||
npmDepsHash = "sha256-bkSOrHjU2rKSku8sOcZRIVKG/mdSOV/lXiYuqUzeXD8=";
|
||||
|
||||
# Prevent onnxruntime-node's install script from running during automatic
|
||||
# npm rebuild (it tries to download from api.nuget.org, which fails in the sandbox).
|
||||
|
||||
Reference in New Issue
Block a user