mirror of
https://github.com/zadam/trilium.git
synced 2025-11-15 10:58:58 +01:00
fix(flake): upgrade to Nodejs 24 (#7732)
Some checks failed
Checks / main (push) Waiting to run
CodeQL Advanced / Analyze (actions) (push) Waiting to run
CodeQL Advanced / Analyze (javascript-typescript) (push) Waiting to run
Deploy Documentation / Build and Deploy Documentation (push) Waiting to run
Dev / Test development (push) Waiting to run
Dev / Build Docker image (push) Blocked by required conditions
Dev / Check Docker build (Dockerfile) (push) Blocked by required conditions
Dev / Check Docker build (Dockerfile.alpine) (push) Blocked by required conditions
/ Check Docker build (Dockerfile) (push) Waiting to run
/ Check Docker build (Dockerfile.alpine) (push) Waiting to run
/ Build Docker images (Dockerfile, ubuntu-24.04-arm, linux/arm64) (push) Blocked by required conditions
/ Build Docker images (Dockerfile.alpine, ubuntu-latest, linux/amd64) (push) Blocked by required conditions
/ Build Docker images (Dockerfile.legacy, ubuntu-24.04-arm, linux/arm/v7) (push) Blocked by required conditions
/ Build Docker images (Dockerfile.legacy, ubuntu-24.04-arm, linux/arm/v8) (push) Blocked by required conditions
/ Merge manifest lists (push) Blocked by required conditions
playwright / E2E tests on linux-arm64 (push) Waiting to run
playwright / E2E tests on linux-x64 (push) Waiting to run
Deploy website / Build & deploy website (push) Has been cancelled
Some checks failed
Checks / main (push) Waiting to run
CodeQL Advanced / Analyze (actions) (push) Waiting to run
CodeQL Advanced / Analyze (javascript-typescript) (push) Waiting to run
Deploy Documentation / Build and Deploy Documentation (push) Waiting to run
Dev / Test development (push) Waiting to run
Dev / Build Docker image (push) Blocked by required conditions
Dev / Check Docker build (Dockerfile) (push) Blocked by required conditions
Dev / Check Docker build (Dockerfile.alpine) (push) Blocked by required conditions
/ Check Docker build (Dockerfile) (push) Waiting to run
/ Check Docker build (Dockerfile.alpine) (push) Waiting to run
/ Build Docker images (Dockerfile, ubuntu-24.04-arm, linux/arm64) (push) Blocked by required conditions
/ Build Docker images (Dockerfile.alpine, ubuntu-latest, linux/amd64) (push) Blocked by required conditions
/ Build Docker images (Dockerfile.legacy, ubuntu-24.04-arm, linux/arm/v7) (push) Blocked by required conditions
/ Build Docker images (Dockerfile.legacy, ubuntu-24.04-arm, linux/arm/v8) (push) Blocked by required conditions
/ Merge manifest lists (push) Blocked by required conditions
playwright / E2E tests on linux-arm64 (push) Waiting to run
playwright / E2E tests on linux-x64 (push) Waiting to run
Deploy website / Build & deploy website (push) Has been cancelled
This commit is contained in:
commit
5dd21ac539
@ -22,7 +22,7 @@
|
|||||||
let
|
let
|
||||||
pkgs = import nixpkgs { inherit system; };
|
pkgs = import nixpkgs { inherit system; };
|
||||||
electron = pkgs."electron_${lib.versions.major packageJsonDesktop.devDependencies.electron}";
|
electron = pkgs."electron_${lib.versions.major packageJsonDesktop.devDependencies.electron}";
|
||||||
nodejs = pkgs.nodejs_22;
|
nodejs = pkgs.nodejs_24;
|
||||||
# pnpm creates an overly long PATH env variable for child processes.
|
# pnpm creates an overly long PATH env variable for child processes.
|
||||||
# This patch deduplicates entries in PATH, which results in an equivalent but shorter entry.
|
# This patch deduplicates entries in PATH, which results in an equivalent but shorter entry.
|
||||||
# https://github.com/pnpm/pnpm/issues/6106
|
# https://github.com/pnpm/pnpm/issues/6106
|
||||||
@ -76,7 +76,7 @@
|
|||||||
preBuildCommands ? "",
|
preBuildCommands ? "",
|
||||||
}:
|
}:
|
||||||
pnpm2nix.packages.${system}.mkPnpmPackage rec {
|
pnpm2nix.packages.${system}.mkPnpmPackage rec {
|
||||||
pname = "triliumnext-${app}";
|
pname = "trilium-${app}";
|
||||||
version = packageJson.version + (lib.optionalString (self ? shortRev) "-${self.shortRev}");
|
version = packageJson.version + (lib.optionalString (self ? shortRev) "-${self.shortRev}");
|
||||||
|
|
||||||
src = fullCleanSource ./.;
|
src = fullCleanSource ./.;
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user